logical_model 0.7.2 → 0.7.4

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (6) hide show
  1. checksums.yaml +4 -4
  2. data/Gemfile +5 -5
  3. data/Gemfile.lock +43 -27
  4. data/lib/typhoeus_fix/array_decoder.rb +7 -2
  5. data/logical_model.gemspec +7 -7
  6. metadata +9 -9
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: e39e999bb8e8bc84b5c5138ff7e00cce49cc36236e2a3d5db824b1b9ff5a42d6
4
- data.tar.gz: a54435e1300de1680bb3e1570aa42745177d041162d0a8c3ccc3adf5624a62f0
3
+ metadata.gz: b9e813874f914e15ae59b5418f3b8f3f7956b634d3b78e6b71b8db7f6d0b24a9
4
+ data.tar.gz: 34e5a57719bdfaa9d8c5e015f375928f555919a05628fbd7e91b8aa6a690e385
5
5
  SHA512:
6
- metadata.gz: d200e9487a6a3313d5d5d9ac44a80968731efdb6512f8f6a8daed1ede078b1e01774af2a3739d88f174b3be2c40f396f7de6333db6381528d781eec9734b1464
7
- data.tar.gz: db7008d138444048699f5b09e5fe1c3fe66a0c308ddbd4092a2e18c0fab621ba8f75dcc479acfb8294d6e6d847a6a886338e44149f8747fa1926c5a761421318
6
+ metadata.gz: bdc851d2855dad7d13c088eb44a16229bd05b57d418149d67af3fcff1d0e952f9e326e052b897c1361acf9da8a20d2667c1a4e8ec969437634801ddf845fe2e0
7
+ data.tar.gz: d0f140df1accc666f3e33a097f71b2681235dfbeb21a9602ee791d019159ee63495568c2f5db026fdf026e285650da70170ba88a532619205cde879ef687e5b2
data/Gemfile CHANGED
@@ -1,10 +1,10 @@
1
1
  # encoding: UTF-8
2
2
  source "http://rubygems.org"
3
3
 
4
- gem "activemodel", '4.2.8'
5
- gem "activesupport", '4.2.8'
6
- gem "typhoeus", '0.6.4'
7
- gem "ethon", "0.6.3"
4
+ gem "activemodel", '4.2.11.3'
5
+ gem "activesupport", '4.2.11.3'
6
+ gem "typhoeus", '>= 1.0.1'
7
+ gem "ethon", ">= 0.8.0"
8
8
  gem "kaminari", '~> 1.2.1'
9
9
 
10
10
  group :development, :test do
@@ -20,7 +20,7 @@ group :development, :test do
20
20
  gem "json", '2.0.0'
21
21
  gem 'gemcutter'
22
22
 
23
- gem "rspec-rails"
23
+ gem "rspec-rails", '2.11.0'
24
24
 
25
25
  gem 'guard-rspec'
26
26
 
data/Gemfile.lock CHANGED
@@ -1,26 +1,32 @@
1
1
  GEM
2
2
  remote: http://rubygems.org/
3
3
  specs:
4
- actionview (4.2.8)
5
- activesupport (= 4.2.8)
4
+ actionpack (4.2.11.3)
5
+ actionview (= 4.2.11.3)
6
+ activesupport (= 4.2.11.3)
7
+ rack (~> 1.6)
8
+ rack-test (~> 0.6.2)
9
+ rails-dom-testing (~> 1.0, >= 1.0.5)
10
+ rails-html-sanitizer (~> 1.0, >= 1.0.2)
11
+ actionview (4.2.11.3)
12
+ activesupport (= 4.2.11.3)
6
13
  builder (~> 3.1)
7
14
  erubis (~> 2.7.0)
8
15
  rails-dom-testing (~> 1.0, >= 1.0.5)
9
16
  rails-html-sanitizer (~> 1.0, >= 1.0.3)
10
- activemodel (4.2.8)
11
- activesupport (= 4.2.8)
17
+ activemodel (4.2.11.3)
18
+ activesupport (= 4.2.11.3)
12
19
  builder (~> 3.1)
13
- activerecord (4.2.8)
14
- activemodel (= 4.2.8)
15
- activesupport (= 4.2.8)
20
+ activerecord (4.2.11.3)
21
+ activemodel (= 4.2.11.3)
22
+ activesupport (= 4.2.11.3)
16
23
  arel (~> 6.0)
17
- activesupport (4.2.8)
24
+ activesupport (4.2.11.3)
18
25
  i18n (~> 0.7)
19
26
  minitest (~> 5.1)
20
27
  thread_safe (~> 0.3, >= 0.3.4)
21
28
  tzinfo (~> 1.1)
22
29
  arel (6.0.4)
23
- backports (3.21.0)
24
30
  builder (3.2.4)
25
31
  coderay (1.1.3)
26
32
  concurrent-ruby (1.1.9)
@@ -44,8 +50,9 @@ GEM
44
50
  pry (>= 0.13.0)
45
51
  shellany (~> 0.0)
46
52
  thor (>= 0.18.1)
47
- guard-rspec (1.2.2)
53
+ guard-rspec (2.5.4)
48
54
  guard (>= 1.1)
55
+ rspec (~> 2.11)
49
56
  i18n (0.9.5)
50
57
  concurrent-ruby (~> 1.0)
51
58
  jeweler (1.6.4)
@@ -89,7 +96,9 @@ GEM
89
96
  coderay (~> 1.1)
90
97
  method_source (~> 1.0)
91
98
  racc (1.5.2)
92
- rack (1.4.7)
99
+ rack (1.6.13)
100
+ rack-test (0.6.3)
101
+ rack (>= 1.0)
93
102
  rails-deprecated_sanitizer (1.0.4)
94
103
  activesupport (>= 4.2.0.alpha)
95
104
  rails-dom-testing (1.0.9)
@@ -98,21 +107,29 @@ GEM
98
107
  rails-deprecated_sanitizer (>= 1.0.1)
99
108
  rails-html-sanitizer (1.4.2)
100
109
  loofah (~> 2.3)
110
+ railties (4.2.11.3)
111
+ actionpack (= 4.2.11.3)
112
+ activesupport (= 4.2.11.3)
113
+ rake (>= 0.8.7)
114
+ thor (>= 0.18.1, < 2.0)
101
115
  rake (13.0.6)
102
116
  rb-fsevent (0.11.0)
103
117
  rb-inotify (0.10.1)
104
118
  ffi (~> 1.0)
105
119
  rchardet (1.8.0)
106
- rspec (2.1.0)
107
- rspec-core (~> 2.1.0)
108
- rspec-expectations (~> 2.1.0)
109
- rspec-mocks (~> 2.1.0)
110
- rspec-core (2.1.0)
111
- rspec-expectations (2.1.0)
112
- diff-lcs (~> 1.1.2)
113
- rspec-mocks (2.1.0)
114
- rspec-rails (2.1.0)
115
- rspec (~> 2.1.0)
120
+ rspec (2.11.0)
121
+ rspec-core (~> 2.11.0)
122
+ rspec-expectations (~> 2.11.0)
123
+ rspec-mocks (~> 2.11.0)
124
+ rspec-core (2.11.1)
125
+ rspec-expectations (2.11.3)
126
+ diff-lcs (~> 1.1.3)
127
+ rspec-mocks (2.11.3)
128
+ rspec-rails (2.11.0)
129
+ actionpack (>= 3.0)
130
+ activesupport (>= 3.0)
131
+ railties (>= 3.0)
132
+ rspec (~> 2.11.0)
116
133
  shellany (0.0.1)
117
134
  shoulda (4.0.0)
118
135
  shoulda-context (~> 2.0)
@@ -120,9 +137,8 @@ GEM
120
137
  shoulda-context (2.0.0)
121
138
  shoulda-matchers (4.5.1)
122
139
  activesupport (>= 4.2.0)
123
- sinatra (1.2.9)
124
- backports
125
- rack (~> 1.1, < 1.5)
140
+ sinatra (1.2.8)
141
+ rack (~> 1.1)
126
142
  tilt (>= 1.2.2, < 2.0)
127
143
  sqlite3 (1.4.2)
128
144
  thor (1.1.0)
@@ -137,9 +153,9 @@ PLATFORMS
137
153
  ruby
138
154
 
139
155
  DEPENDENCIES
140
- activemodel (= 4.2.8)
156
+ activemodel (= 4.2.11.3)
141
157
  activerecord
142
- activesupport (= 4.2.8)
158
+ activesupport (= 4.2.11.3)
143
159
  bundler (>= 1.2.2)
144
160
  ethon (= 0.6.3)
145
161
  gemcutter
@@ -150,7 +166,7 @@ DEPENDENCIES
150
166
  libnotify
151
167
  rake
152
168
  rb-inotify
153
- rspec-rails
169
+ rspec-rails (= 2.11.0)
154
170
  shoulda
155
171
  sinatra (~> 1.2.6)
156
172
  sqlite3
data/lib/typhoeus_fix/array_decoder.rb CHANGED
@@ -33,9 +33,9 @@ module TyphoeusFix
33
33
  #
34
34
  # @return [Hash] Hash with properly decoded nested arrays.
35
35
  def decode!(hash)
36
- return hash unless hash.is_a?(Hash)
36
+ return hash unless is_hash?(hash)
37
37
  hash.each_pair do |key,value|
38
- if value.is_a?(Hash)
38
+ if is_hash?(value)
39
39
  decode!(value)
40
40
  hash[key] = convert(value)
41
41
  end
@@ -49,6 +49,10 @@ module TyphoeusFix
49
49
 
50
50
  private
51
51
 
52
+ def is_hash?(hash)
53
+ hash.is_a?(Hash) || hash.is_a?(HashWithIndifferentAccess) || hash.is_a?(ActionController::Parameters)
54
+ end
55
+
52
56
  # Checks if Hash is an Array encoded as a Hash.
53
57
  # Specifically will check for the Hash to have this
54
58
  # form: {'0' => v0, '1' => v1, .., 'n' => vN }
@@ -74,6 +78,7 @@ module TyphoeusFix
74
78
  # @return [Arraya/Hash]
75
79
  def convert(hash)
76
80
  if encoded?(hash)
81
+ hash = hash.to_unsafe_h if hash.respond_to?(:to_unsafe_h)
77
82
  Hash[hash.sort_by{|k,v|k.to_i}].values
78
83
  else
79
84
  hash
data/logical_model.gemspec CHANGED
@@ -6,7 +6,7 @@
6
6
 
7
7
  Gem::Specification.new do |s|
8
8
  s.name = "logical_model"
9
- s.version = "0.7.2"
9
+ s.version = "0.7.4"
10
10
 
11
11
  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
12
12
  s.require_paths = ["lib"]
@@ -70,8 +70,8 @@ Gem::Specification.new do |s|
70
70
  if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
71
71
  s.add_runtime_dependency(%q<activemodel>, [">= 0"])
72
72
  s.add_runtime_dependency(%q<activesupport>, [">= 0"])
73
- s.add_runtime_dependency(%q<typhoeus>, ["= 0.6.4"])
74
- s.add_runtime_dependency(%q<ethon>, ["= 0.6.3"])
73
+ s.add_runtime_dependency(%q<typhoeus>, [">= 1.0.1"])
74
+ s.add_runtime_dependency(%q<ethon>, [">= 0.8.0"])
75
75
  s.add_runtime_dependency(%q<kaminari>, ["~> 1.2.1"])
76
76
  s.add_development_dependency(%q<rake>, [">= 0"])
77
77
  s.add_development_dependency(%q<activerecord>, [">= 0"])
@@ -88,8 +88,8 @@ Gem::Specification.new do |s|
88
88
  else
89
89
  s.add_dependency(%q<activemodel>, [">= 0"])
90
90
  s.add_dependency(%q<activesupport>, [">= 0"])
91
- s.add_dependency(%q<typhoeus>, ["= 0.6.4"])
92
- s.add_dependency(%q<ethon>, ["= 0.6.3"])
91
+ s.add_dependency(%q<typhoeus>, [">= 1.0.1"])
92
+ s.add_dependency(%q<ethon>, [">= 0.8.0"])
93
93
  s.add_dependency(%q<kaminari>, ["~> 1.2.1"])
94
94
  s.add_dependency(%q<rake>, [">= 0"])
95
95
  s.add_dependency(%q<activerecord>, [">= 0"])
@@ -107,8 +107,8 @@ Gem::Specification.new do |s|
107
107
  else
108
108
  s.add_dependency(%q<activemodel>, [">= 0"])
109
109
  s.add_dependency(%q<activesupport>, [">= 0"])
110
- s.add_dependency(%q<typhoeus>, ["= 0.6.4"])
111
- s.add_dependency(%q<ethon>, ["= 0.6.3"])
110
+ s.add_dependency(%q<typhoeus>, [">= 1.0.1"])
111
+ s.add_dependency(%q<ethon>, [">= 0.8.0"])
112
112
  s.add_dependency(%q<kaminari>, ["~> 1.2.1"])
113
113
  s.add_dependency(%q<rake>, [">= 0"])
114
114
  s.add_dependency(%q<activerecord>, [">= 0"])
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: logical_model
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.7.2
4
+ version: 0.7.4
5
5
  platform: ruby
6
6
  authors:
7
7
  - Dwayne Macgowan
@@ -42,30 +42,30 @@ dependencies:
42
42
  name: typhoeus
43
43
  requirement: !ruby/object:Gem::Requirement
44
44
  requirements:
45
- - - '='
45
+ - - ">="
46
46
  - !ruby/object:Gem::Version
47
- version: 0.6.4
47
+ version: 1.0.1
48
48
  type: :runtime
49
49
  prerelease: false
50
50
  version_requirements: !ruby/object:Gem::Requirement
51
51
  requirements:
52
- - - '='
52
+ - - ">="
53
53
  - !ruby/object:Gem::Version
54
- version: 0.6.4
54
+ version: 1.0.1
55
55
  - !ruby/object:Gem::Dependency
56
56
  name: ethon
57
57
  requirement: !ruby/object:Gem::Requirement
58
58
  requirements:
59
- - - '='
59
+ - - ">="
60
60
  - !ruby/object:Gem::Version
61
- version: 0.6.3
61
+ version: 0.8.0
62
62
  type: :runtime
63
63
  prerelease: false
64
64
  version_requirements: !ruby/object:Gem::Requirement
65
65
  requirements:
66
- - - '='
66
+ - - ">="
67
67
  - !ruby/object:Gem::Version
68
- version: 0.6.3
68
+ version: 0.8.0
69
69
  - !ruby/object:Gem::Dependency
70
70
  name: kaminari
71
71
  requirement: !ruby/object:Gem::Requirement