Skip to content

Commit 509b56e

Browse files
uttamukkojiuttamukkoji
authored
Merge pull request #20 from contentstack/bug/class-extension
Monkey Patch for Ruby classes removed
2 parents 19a4b99 + 90514f6 commit 509b56e

11 files changed

+127
-106
lines changed

‎CHANGELOG.md

+6
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,10 @@
11
## CHANGELOG
2+
------------------------------------------------
3+
## Version 0.4.3
4+
### Date: 17th-Sept-2021
5+
### Dependency update
6+
- Issue for Monkey patching resolved. Implemented Refine to extend class within module scope.
7+
28
------------------------------------------------
39
## Version 0.4.2
410
### Date: 2nd-Sept-2021

‎lib/contentstack.rb

-2
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,6 @@
44
require "contentstack/client"
55
require "contentstack/region"
66
require "contentstack_utils"
7-
require "util"
8-
97

108
# == Contentstack - Ruby SDK
119
# Contentstack is a content management system that facilitates the process of publication by separating the content from site-related programming and design.

‎lib/contentstack/api.rb

+2-1
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,10 @@
33
require 'active_support'
44
require 'active_support/json'
55
require 'open-uri'
6-
6+
require 'util'
77
module Contentstack
88
class API
9+
using Utility
910
def self.init_api(api_key, delivery_token, environment,host)
1011
@host = host
1112
@api_version = '/v3'

‎lib/contentstack/asset.rb

+2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
1+
require 'util'
12
module Contentstack
23

34
# Asset class to fetch file details on Conentstack server.
45
class Asset
6+
using Utility
57
attr_reader :uid, :content_type, :filename, :file_size, :tags, :url
68

79
# @!attribute [r] uid

‎lib/contentstack/asset_collection.rb

+2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,10 @@
11
require 'contentstack/asset'
2+
require 'util'
23

34
module Contentstack
45
# Asset class to fetch details of files on Conentstack server.
56
class AssetCollection
7+
using Utility
68
attr_reader :assets
79

810
def initialize(assets_array=nil)

‎lib/contentstack/content_type.rb

+2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
11
require 'contentstack/query'
2+
require 'util'
23

34
module Contentstack
45
class ContentType
6+
using Utility
57
[:title, :uid, :created_at, :updated_at, :attributes].each do |method_name|
68
if [:created_at, :updated_at].include?(method_name)
79
define_method method_name do

‎lib/contentstack/entry.rb

+2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
11
require 'active_support/core_ext'
2+
require 'util'
23

34
module Contentstack
45
class Entry
6+
using Utility
57
attr_reader :fields, :content_type, :uid, :owner, :query, :schema, :content_type
68
def initialize(attrs, content_type_uid=nil)
79
setup(attrs, content_type_uid)

‎lib/contentstack/entry_collection.rb

+2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
11
require 'contentstack/entry'
2+
require 'util'
23

34
module Contentstack
45
class EntryCollection
6+
using Utility
57
attr_reader :entries, :count, :content_type, :schema
68

79
def initialize(json, content_type_uid=nil)

‎lib/contentstack/query.rb

+2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,10 @@
11
require 'contentstack/entry_collection'
2+
require 'util'
23

34
module Contentstack
45
# A class that defines a query that is used to query for Entry instance.
56
class Query
7+
using Utility
68
# @!attribute [r] query
79
# Attribute which has all the information about the query which will be executed against Contentstack API
810

‎lib/contentstack/version.rb

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
module Contentstack
2-
VERSION = "0.4.2"
2+
VERSION = "0.4.3"
33
end

‎lib/util.rb

+106-102
Original file line numberDiff line numberDiff line change
@@ -1,107 +1,111 @@
1-
class Hash
2-
def to_query(namespace = nil)
3-
collect do |key, value|
4-
value.to_query(namespace ? "#{namespace}[#{key}]" : key)
5-
end.sort * '&'
6-
end
7-
8-
def symbolize_keys
9-
new_hash = {}
10-
self.each do |key,value|
11-
if [Hash, Array].include?(value.class)
12-
new_hash[key.to_sym] = value.symbolize_keys
13-
else
14-
new_hash[key.to_sym] = value
1+
module Contentstack
2+
module Utility
3+
refine Hash do
4+
def to_query(namespace = nil)
5+
collect do |key, value|
6+
value.to_query(namespace ? "#{namespace}[#{key}]" : key)
7+
end.sort * '&'
8+
end
9+
10+
def symbolize_keys
11+
new_hash = {}
12+
self.each do |key,value|
13+
if [Hash, Array].include?(value.class)
14+
new_hash[key.to_sym] = value.symbolize_keys
15+
else
16+
new_hash[key.to_sym] = value
17+
end
18+
end
19+
new_hash
20+
end
21+
end
22+
23+
refine Array do
24+
def to_query(key)
25+
prefix = "#{key}[]"
26+
collect { |value| value.to_query(prefix) }.join '&'
27+
end
28+
29+
def symbolize_keys
30+
collect do |entry|
31+
if entry.class == Hash
32+
entry.symbolize_keys
33+
else
34+
entry
35+
end
36+
end
37+
end
38+
end
39+
40+
refine String do
41+
def to_query(key)
42+
require 'cgi' unless defined?(CGI) && defined?(CGI::escape)
43+
"#{CGI.escape(key.to_param)}=#{CGI.escape(to_param.to_s)}"
44+
end
45+
46+
def to_param
47+
to_s
48+
end
49+
end
50+
51+
refine Symbol do
52+
def to_query(key)
53+
to_s.to_query(key)
54+
end
55+
56+
def to_param
57+
to_s
58+
end
59+
end
60+
61+
refine NilClass do
62+
def to_query(key)
63+
to_s.to_query(key)
64+
end
65+
66+
def to_param
67+
to_s
68+
end
69+
end
70+
71+
refine TrueClass do
72+
def to_query(key)
73+
to_s.to_query(key)
74+
end
75+
76+
def to_query(val)
77+
"#{CGI.escape(val.to_param)}=#{CGI.escape(to_s)}"
1578
end
1679
end
17-
new_hash
18-
end
19-
end
20-
21-
class Array
22-
def to_query(key)
23-
prefix = "#{key}[]"
24-
collect { |value| value.to_query(prefix) }.join '&'
25-
end
26-
27-
def symbolize_keys
28-
collect do |entry|
29-
if entry.class == Hash
30-
entry.symbolize_keys
31-
else
32-
entry
80+
81+
refine FalseClass do
82+
def to_query(key)
83+
to_s.to_query(key)
84+
end
85+
86+
def to_query(val)
87+
"#{CGI.escape(val.to_param)}=#{CGI.escape(to_s)}"
3388
end
3489
end
35-
end
36-
end
37-
38-
class String
39-
def to_query(key)
40-
require 'cgi' unless defined?(CGI) && defined?(CGI::escape)
41-
"#{CGI.escape(key.to_param)}=#{CGI.escape(to_param.to_s)}"
42-
end
43-
44-
def to_param
45-
to_s
46-
end
47-
end
48-
49-
class Symbol
50-
def to_query(key)
51-
to_s.to_query(key)
52-
end
53-
54-
def to_param
55-
to_s
56-
end
57-
end
58-
59-
class NilClass
60-
def to_query(key)
61-
to_s.to_query(key)
62-
end
63-
64-
def to_param
65-
to_s
66-
end
67-
end
68-
69-
class TrueClass
70-
def to_query(key)
71-
to_s.to_query(key)
72-
end
73-
74-
def to_query(val)
75-
"#{CGI.escape(val.to_param)}=#{CGI.escape(to_s)}"
76-
end
77-
end
78-
79-
class FalseClass
80-
def to_query(key)
81-
to_s.to_query(key)
82-
end
83-
84-
def to_query(val)
85-
"#{CGI.escape(val.to_param)}=#{CGI.escape(to_s)}"
86-
end
87-
end
88-
89-
class Integer
90-
def to_query(key)
91-
to_s.to_query(key)
92-
end
93-
94-
def to_query(val)
95-
"#{CGI.escape(val.to_param)}=#{CGI.escape(to_s)}"
96-
end
97-
end
98-
99-
class Numeric
100-
def to_query(key)
101-
to_s.to_query(key)
102-
end
103-
104-
def to_query(val)
105-
"#{CGI.escape(val.to_param)}=#{CGI.escape(to_s)}"
106-
end
90+
91+
refine Integer do
92+
def to_query(key)
93+
to_s.to_query(key)
94+
end
95+
96+
def to_query(val)
97+
"#{CGI.escape(val.to_param)}=#{CGI.escape(to_s)}"
98+
end
99+
end
100+
101+
refine Numeric do
102+
def to_query(key)
103+
to_s.to_query(key)
104+
end
105+
106+
def to_query(val)
107+
"#{CGI.escape(val.to_param)}=#{CGI.escape(to_s)}"
108+
end
109+
end
110+
end
107111
end

0 commit comments

Comments
 (0)