tinia 2.3.0 → 3.0.0

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 (9) hide show
  1. data/Gemfile +1 -1
  2. data/Gemfile.lock +63 -19
  3. data/VERSION +1 -1
  4. data/lib/tinia/connection.rb +1 -1
  5. data/lib/tinia/search.rb +2 -6
  6. data/spec/tinia/index_spec.rb +1 -1
  7. data/spec/tinia/search_spec.rb +6 -6
  8. data/tinia.gemspec +4 -4
  9. metadata +27 -27
data/Gemfile CHANGED
@@ -4,7 +4,7 @@ source "http://rubygems.org"
4
4
  # gem "activesupport", ">= 2.3.5"
5
5
 
6
6
  gem "aws_cloud_search"
7
- gem "rails", "~> 2.3"
7
+ gem "rails", "~> 3.0.9"
8
8
 
9
9
 
10
10
  # Add dependencies to develop your gem here.
data/Gemfile.lock CHANGED
@@ -1,21 +1,42 @@
1
1
  GEM
2
2
  remote: http://rubygems.org/
3
3
  specs:
4
- actionmailer (2.3.14)
5
- actionpack (= 2.3.14)
6
- actionpack (2.3.14)
7
- activesupport (= 2.3.14)
8
- rack (~> 1.1.0)
9
- activerecord (2.3.14)
10
- activesupport (= 2.3.14)
11
- activeresource (2.3.14)
12
- activesupport (= 2.3.14)
13
- activesupport (2.3.14)
4
+ abstract (1.0.0)
5
+ actionmailer (3.0.9)
6
+ actionpack (= 3.0.9)
7
+ mail (~> 2.2.19)
8
+ actionpack (3.0.9)
9
+ activemodel (= 3.0.9)
10
+ activesupport (= 3.0.9)
11
+ builder (~> 2.1.2)
12
+ erubis (~> 2.6.6)
13
+ i18n (~> 0.5.0)
14
+ rack (~> 1.2.1)
15
+ rack-mount (~> 0.6.14)
16
+ rack-test (~> 0.5.7)
17
+ tzinfo (~> 0.3.23)
18
+ activemodel (3.0.9)
19
+ activesupport (= 3.0.9)
20
+ builder (~> 2.1.2)
21
+ i18n (~> 0.5.0)
22
+ activerecord (3.0.9)
23
+ activemodel (= 3.0.9)
24
+ activesupport (= 3.0.9)
25
+ arel (~> 2.0.10)
26
+ tzinfo (~> 0.3.23)
27
+ activeresource (3.0.9)
28
+ activemodel (= 3.0.9)
29
+ activesupport (= 3.0.9)
30
+ activesupport (3.0.9)
14
31
  archive-tar-minitar (0.5.2)
32
+ arel (2.0.10)
15
33
  aws_cloud_search (0.0.1)
16
34
  faraday_middleware (>= 0.8.0)
35
+ builder (2.1.2)
17
36
  columnize (0.3.6)
18
37
  diff-lcs (1.1.3)
38
+ erubis (2.6.6)
39
+ abstract (>= 1.0.0)
19
40
  faraday (0.8.0)
20
41
  multipart-post (~> 1.1)
21
42
  faraday_middleware (0.8.7)
@@ -27,6 +48,7 @@ GEM
27
48
  thor (~> 0.14.6)
28
49
  guard-rspec (0.7.0)
29
50
  guard (>= 0.10.0)
51
+ i18n (0.5.0)
30
52
  jeweler (1.8.3)
31
53
  bundler (~> 1.0)
32
54
  git (>= 1.2.5)
@@ -35,19 +57,37 @@ GEM
35
57
  json (1.6.6)
36
58
  linecache19 (0.5.12)
37
59
  ruby_core_source (>= 0.1.4)
60
+ mail (2.2.19)
61
+ activesupport (>= 2.3.6)
62
+ i18n (>= 0.4.0)
63
+ mime-types (~> 1.16)
64
+ treetop (~> 1.4.8)
38
65
  metaclass (0.0.1)
66
+ mime-types (1.18)
39
67
  mocha (0.10.5)
40
68
  metaclass (~> 0.0.1)
41
69
  multi_json (1.3.2)
42
70
  multipart-post (1.1.5)
43
- rack (1.1.3)
44
- rails (2.3.14)
45
- actionmailer (= 2.3.14)
46
- actionpack (= 2.3.14)
47
- activerecord (= 2.3.14)
48
- activeresource (= 2.3.14)
49
- activesupport (= 2.3.14)
50
- rake (>= 0.8.3)
71
+ polyglot (0.3.3)
72
+ rack (1.2.5)
73
+ rack-mount (0.6.14)
74
+ rack (>= 1.0.0)
75
+ rack-test (0.5.7)
76
+ rack (>= 1.0)
77
+ rails (3.0.9)
78
+ actionmailer (= 3.0.9)
79
+ actionpack (= 3.0.9)
80
+ activerecord (= 3.0.9)
81
+ activeresource (= 3.0.9)
82
+ activesupport (= 3.0.9)
83
+ bundler (~> 1.0)
84
+ railties (= 3.0.9)
85
+ railties (3.0.9)
86
+ actionpack (= 3.0.9)
87
+ activesupport (= 3.0.9)
88
+ rake (>= 0.8.7)
89
+ rdoc (~> 3.4)
90
+ thor (~> 0.14.4)
51
91
  rake (0.9.2.2)
52
92
  rdoc (3.12)
53
93
  json (~> 1.4)
@@ -75,6 +115,10 @@ GEM
75
115
  simplecov-html (0.5.3)
76
116
  sqlite3 (1.3.5)
77
117
  thor (0.14.6)
118
+ treetop (1.4.10)
119
+ polyglot
120
+ polyglot (>= 0.3.1)
121
+ tzinfo (0.3.33)
78
122
  yard (0.7.5)
79
123
 
80
124
  PLATFORMS
@@ -86,7 +130,7 @@ DEPENDENCIES
86
130
  guard-rspec
87
131
  jeweler (~> 1.8.3)
88
132
  mocha
89
- rails (~> 2.3)
133
+ rails (~> 3.0.9)
90
134
  rdoc (~> 3.12)
91
135
  rspec (~> 2.8.0)
92
136
  ruby-debug19
data/VERSION CHANGED
@@ -1 +1 @@
1
- 2.3.0
1
+ 3.0.0
data/lib/tinia/connection.rb CHANGED
@@ -4,7 +4,7 @@ module Tinia
4
4
  def self.included(klass)
5
5
  klass.send(:extend, ClassMethods)
6
6
  klass.class_eval do
7
- class_inheritable_accessor :cloud_search_domain
7
+ class_attribute :cloud_search_domain
8
8
  end
9
9
  end
10
10
 
data/lib/tinia/search.rb CHANGED
@@ -7,13 +7,9 @@ module Tinia
7
7
  klass.class_eval do
8
8
  # lambda block for the scope
9
9
  scope_def = lambda{|*ids|
10
- {
11
- :conditions => [
12
- "#{self.table_name}.#{self.primary_key} IN (?)", ids.flatten
13
- ]
14
- }
10
+ where("#{self.table_name}.#{self.primary_key} IN (?)", ids.flatten)
15
11
  }
16
- named_scope :tinia_scope, scope_def do
12
+ scope :tinia_scope, scope_def do
17
13
  include WillPaginateMethods
18
14
  end
19
15
  end
data/spec/tinia/index_spec.rb CHANGED
@@ -11,7 +11,7 @@ describe Tinia::Index do
11
11
  t.timestamps
12
12
  end
13
13
 
14
- conn.create_table(:mock_index_with_datas, :force => true) do |t|
14
+ conn.create_table(:mock_index_with_data, :force => true) do |t|
15
15
  t.string(:name)
16
16
  t.string(:type)
17
17
  t.timestamps
data/spec/tinia/search_spec.rb CHANGED
@@ -15,8 +15,8 @@ describe Tinia::Search do
15
15
  config.cloud_search_domain = "mock-class"
16
16
  end
17
17
 
18
- named_scope :name_like, lambda{|n|
19
- {:conditions => ["name LIKE ?", n]}
18
+ scope :name_like, lambda{|n|
19
+ where("name LIKE ?", n)
20
20
  }
21
21
 
22
22
  end
@@ -51,8 +51,8 @@ describe Tinia::Search do
51
51
  an Arel-like object" do
52
52
 
53
53
  proxy = MockClass.cloud_search("my query")
54
- proxy.proxy_options[:conditions].should eql(
55
- ["mock_classes.id IN (?)", [1, 2]]
54
+ proxy.where_values.should eql(
55
+ ["mock_classes.id IN (1,2)"]
56
56
  )
57
57
  end
58
58
 
@@ -73,8 +73,8 @@ describe Tinia::Search do
73
73
 
74
74
  it "should allow for a complex query" do
75
75
  proxy = MockClass.cloud_search("(and 'x' other_field:'y')")
76
- proxy.proxy_options[:conditions].should eql(
77
- ["mock_classes.id IN (?)", [1, 2]]
76
+ proxy.where_values.should eql(
77
+ ["mock_classes.id IN (1,2)"]
78
78
  )
79
79
  end
80
80
  end
data/tinia.gemspec CHANGED
@@ -5,7 +5,7 @@
5
5
 
6
6
  Gem::Specification.new do |s|
7
7
  s.name = "tinia"
8
- s.version = "2.3.0"
8
+ s.version = "3.0.0"
9
9
 
10
10
  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
11
11
  s.authors = ["Dan Langevin"]
@@ -51,7 +51,7 @@ Gem::Specification.new do |s|
51
51
 
52
52
  if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
53
53
  s.add_runtime_dependency(%q<aws_cloud_search>, [">= 0"])
54
- s.add_runtime_dependency(%q<rails>, ["~> 2.3"])
54
+ s.add_runtime_dependency(%q<rails>, ["~> 3.0.9"])
55
55
  s.add_development_dependency(%q<bundler>, ["~> 1.0.0"])
56
56
  s.add_development_dependency(%q<guard-rspec>, [">= 0"])
57
57
  s.add_development_dependency(%q<jeweler>, ["~> 1.8.3"])
@@ -64,7 +64,7 @@ Gem::Specification.new do |s|
64
64
  s.add_development_dependency(%q<yard>, ["~> 0.7"])
65
65
  else
66
66
  s.add_dependency(%q<aws_cloud_search>, [">= 0"])
67
- s.add_dependency(%q<rails>, ["~> 2.3"])
67
+ s.add_dependency(%q<rails>, ["~> 3.0.9"])
68
68
  s.add_dependency(%q<bundler>, ["~> 1.0.0"])
69
69
  s.add_dependency(%q<guard-rspec>, [">= 0"])
70
70
  s.add_dependency(%q<jeweler>, ["~> 1.8.3"])
@@ -78,7 +78,7 @@ Gem::Specification.new do |s|
78
78
  end
79
79
  else
80
80
  s.add_dependency(%q<aws_cloud_search>, [">= 0"])
81
- s.add_dependency(%q<rails>, ["~> 2.3"])
81
+ s.add_dependency(%q<rails>, ["~> 3.0.9"])
82
82
  s.add_dependency(%q<bundler>, ["~> 1.0.0"])
83
83
  s.add_dependency(%q<guard-rspec>, [">= 0"])
84
84
  s.add_dependency(%q<jeweler>, ["~> 1.8.3"])
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: tinia
3
3
  version: !ruby/object:Gem::Version
4
- version: 2.3.0
4
+ version: 3.0.0
5
5
  prerelease:
6
6
  platform: ruby
7
7
  authors:
@@ -13,7 +13,7 @@ date: 2012-05-08 00:00:00.000000000 Z
13
13
  dependencies:
14
14
  - !ruby/object:Gem::Dependency
15
15
  name: aws_cloud_search
16
- requirement: &2177020500 !ruby/object:Gem::Requirement
16
+ requirement: &2166206220 !ruby/object:Gem::Requirement
17
17
  none: false
18
18
  requirements:
19
19
  - - ! '>='
@@ -21,21 +21,21 @@ dependencies:
21
21
  version: '0'
22
22
  type: :runtime
23
23
  prerelease: false
24
- version_requirements: *2177020500
24
+ version_requirements: *2166206220
25
25
  - !ruby/object:Gem::Dependency
26
26
  name: rails
27
- requirement: &2177019440 !ruby/object:Gem::Requirement
27
+ requirement: &2166203920 !ruby/object:Gem::Requirement
28
28
  none: false
29
29
  requirements:
30
30
  - - ~>
31
31
  - !ruby/object:Gem::Version
32
- version: '2.3'
32
+ version: 3.0.9
33
33
  type: :runtime
34
34
  prerelease: false
35
- version_requirements: *2177019440
35
+ version_requirements: *2166203920
36
36
  - !ruby/object:Gem::Dependency
37
37
  name: bundler
38
- requirement: &2177018420 !ruby/object:Gem::Requirement
38
+ requirement: &2166201980 !ruby/object:Gem::Requirement
39
39
  none: false
40
40
  requirements:
41
41
  - - ~>
@@ -43,10 +43,10 @@ dependencies:
43
43
  version: 1.0.0
44
44
  type: :development
45
45
  prerelease: false
46
- version_requirements: *2177018420
46
+ version_requirements: *2166201980
47
47
  - !ruby/object:Gem::Dependency
48
48
  name: guard-rspec
49
- requirement: &2177017300 !ruby/object:Gem::Requirement
49
+ requirement: &2166200380 !ruby/object:Gem::Requirement
50
50
  none: false
51
51
  requirements:
52
52
  - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
54
54
  version: '0'
55
55
  type: :development
56
56
  prerelease: false
57
- version_requirements: *2177017300
57
+ version_requirements: *2166200380
58
58
  - !ruby/object:Gem::Dependency
59
59
  name: jeweler
60
- requirement: &2177016240 !ruby/object:Gem::Requirement
60
+ requirement: &2166199160 !ruby/object:Gem::Requirement
61
61
  none: false
62
62
  requirements:
63
63
  - - ~>
@@ -65,10 +65,10 @@ dependencies:
65
65
  version: 1.8.3
66
66
  type: :development
67
67
  prerelease: false
68
- version_requirements: *2177016240
68
+ version_requirements: *2166199160
69
69
  - !ruby/object:Gem::Dependency
70
70
  name: mocha
71
- requirement: &2177015360 !ruby/object:Gem::Requirement
71
+ requirement: &2166197280 !ruby/object:Gem::Requirement
72
72
  none: false
73
73
  requirements:
74
74
  - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
76
76
  version: '0'
77
77
  type: :development
78
78
  prerelease: false
79
- version_requirements: *2177015360
79
+ version_requirements: *2166197280
80
80
  - !ruby/object:Gem::Dependency
81
81
  name: rdoc
82
- requirement: &2177014500 !ruby/object:Gem::Requirement
82
+ requirement: &2166195120 !ruby/object:Gem::Requirement
83
83
  none: false
84
84
  requirements:
85
85
  - - ~>
@@ -87,10 +87,10 @@ dependencies:
87
87
  version: '3.12'
88
88
  type: :development
89
89
  prerelease: false
90
- version_requirements: *2177014500
90
+ version_requirements: *2166195120
91
91
  - !ruby/object:Gem::Dependency
92
92
  name: rspec
93
- requirement: &2177008360 !ruby/object:Gem::Requirement
93
+ requirement: &2166192780 !ruby/object:Gem::Requirement
94
94
  none: false
95
95
  requirements:
96
96
  - - ~>
@@ -98,10 +98,10 @@ dependencies:
98
98
  version: 2.8.0
99
99
  type: :development
100
100
  prerelease: false
101
- version_requirements: *2177008360
101
+ version_requirements: *2166192780
102
102
  - !ruby/object:Gem::Dependency
103
103
  name: ruby-debug19
104
- requirement: &2177007240 !ruby/object:Gem::Requirement
104
+ requirement: &2166191000 !ruby/object:Gem::Requirement
105
105
  none: false
106
106
  requirements:
107
107
  - - ! '>='
@@ -109,10 +109,10 @@ dependencies:
109
109
  version: '0'
110
110
  type: :development
111
111
  prerelease: false
112
- version_requirements: *2177007240
112
+ version_requirements: *2166191000
113
113
  - !ruby/object:Gem::Dependency
114
114
  name: simplecov
115
- requirement: &2177006580 !ruby/object:Gem::Requirement
115
+ requirement: &2166189920 !ruby/object:Gem::Requirement
116
116
  none: false
117
117
  requirements:
118
118
  - - ! '>='
@@ -120,10 +120,10 @@ dependencies:
120
120
  version: '0'
121
121
  type: :development
122
122
  prerelease: false
123
- version_requirements: *2177006580
123
+ version_requirements: *2166189920
124
124
  - !ruby/object:Gem::Dependency
125
125
  name: sqlite3
126
- requirement: &2177005780 !ruby/object:Gem::Requirement
126
+ requirement: &2166188660 !ruby/object:Gem::Requirement
127
127
  none: false
128
128
  requirements:
129
129
  - - ! '>='
@@ -131,10 +131,10 @@ dependencies:
131
131
  version: '0'
132
132
  type: :development
133
133
  prerelease: false
134
- version_requirements: *2177005780
134
+ version_requirements: *2166188660
135
135
  - !ruby/object:Gem::Dependency
136
136
  name: yard
137
- requirement: &2177004860 !ruby/object:Gem::Requirement
137
+ requirement: &2166187500 !ruby/object:Gem::Requirement
138
138
  none: false
139
139
  requirements:
140
140
  - - ~>
@@ -142,7 +142,7 @@ dependencies:
142
142
  version: '0.7'
143
143
  type: :development
144
144
  prerelease: false
145
- version_requirements: *2177004860
145
+ version_requirements: *2166187500
146
146
  description: Rails integration for CloudSearch
147
147
  email: dan.langevin@lifebooker.com
148
148
  executables: []
@@ -188,7 +188,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
188
188
  version: '0'
189
189
  segments:
190
190
  - 0
191
- hash: -634642939761900410
191
+ hash: -3860505524591393351
192
192
  required_rubygems_version: !ruby/object:Gem::Requirement
193
193
  none: false
194
194
  requirements: