query-interface-server 1.0.4 → 1.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: dd050560ba023e3105bcca63c25a537b2cbec376
-  data.tar.gz: 6cde57ff0ca003036a8fa1ff0736a9e1e279b2c8
+  metadata.gz: 6fb550135a6842572fc049da4d88e94c6e869c24
+  data.tar.gz: 0be204391a9fd4b5765978125234b2b954e5bdc1
 SHA512:
-  metadata.gz: 30ae3762d4eea72df0fd6b55400fee3bfc76773fdfd7fd0a93d33bc0a568cdd6307385800a920b217c4de0ecfc1e711039d65646f9c553cac649a23b400fdb87
-  data.tar.gz: 6b4dac2e8e472b5b2cb06568b98486f777905e7499d5b6f255707e34cc5b3f520ce483f699222076415abe4a95af74fc6c5333625577cdc14e20a39070f320c3
+  metadata.gz: ac6665bc4094a107cce0156af9e97242d8414412fead578918bc9d7d24cf28e17eb9194f6ed39f17a9364527f3cf68ba737230565548d98252272c6f7313251d
+  data.tar.gz: 24d9b442c532ab19abaa70ca8f95805a1a671e0de9a19051b0b150238c86d57afc9315b5e96f5b0bd654b3c17d96b17ce2fbe52d39ec4a3cc65302b04533a1c5

data/Gemfile.lock

@@ -1,99 +1,106 @@
 GEM
   remote: http://rubygems.org/
   specs:
-    actionmailer (4.0.0)
-      actionpack (= 4.0.0)
-      mail (~> 2.5.3)
-    actionpack (4.0.0)
-      activesupport (= 4.0.0)
-      builder (~> 3.1.0)
-      erubis (~> 2.7.0)
+    actionmailer (4.1.1)
+      actionpack (= 4.1.1)
+      actionview (= 4.1.1)
+      mail (~> 2.5.4)
+    actionpack (4.1.1)
+      actionview (= 4.1.1)
+      activesupport (= 4.1.1)
       rack (~> 1.5.2)
       rack-test (~> 0.6.2)
-    activemodel (4.0.0)
-      activesupport (= 4.0.0)
-      builder (~> 3.1.0)
-    activerecord (4.0.0)
-      activemodel (= 4.0.0)
-      activerecord-deprecated_finders (~> 1.0.2)
-      activesupport (= 4.0.0)
-      arel (~> 4.0.0)
-    activerecord-deprecated_finders (1.0.3)
-    activesupport (4.0.0)
-      i18n (~> 0.6, >= 0.6.4)
-      minitest (~> 4.2)
-      multi_json (~> 1.3)
+    actionview (4.1.1)
+      activesupport (= 4.1.1)
+      builder (~> 3.1)
+      erubis (~> 2.7.0)
+    activemodel (4.1.1)
+      activesupport (= 4.1.1)
+      builder (~> 3.1)
+    activerecord (4.1.1)
+      activemodel (= 4.1.1)
+      activesupport (= 4.1.1)
+      arel (~> 5.0.0)
+    activesupport (4.1.1)
+      i18n (~> 0.6, >= 0.6.9)
+      json (~> 1.7, >= 1.7.7)
+      minitest (~> 5.1)
       thread_safe (~> 0.1)
-      tzinfo (~> 0.3.37)
-    arel (4.0.0)
-    atomic (1.1.10)
+      tzinfo (~> 1.1)
+    arel (5.0.1.20140414130214)
     autotest-standalone (4.5.11)
-    builder (3.1.4)
-    diff-lcs (1.2.4)
+    builder (3.2.2)
+    diff-lcs (1.2.5)
+    docile (1.1.3)
     erubis (2.7.0)
     hike (1.2.3)
-    i18n (0.6.4)
+    i18n (0.6.9)
+    json (1.8.1)
     mail (2.5.4)
       mime-types (~> 1.16)
       treetop (~> 1.4.8)
-    mime-types (1.23)
-    minitest (4.7.5)
-    multi_json (1.7.7)
-    polyglot (0.3.3)
+    mime-types (1.25.1)
+    minitest (5.3.3)
+    multi_json (1.10.0)
+    polyglot (0.3.4)
     rack (1.5.2)
     rack-test (0.6.2)
       rack (>= 1.0)
-    rails (4.0.0)
-      actionmailer (= 4.0.0)
-      actionpack (= 4.0.0)
-      activerecord (= 4.0.0)
-      activesupport (= 4.0.0)
+    rails (4.1.1)
+      actionmailer (= 4.1.1)
+      actionpack (= 4.1.1)
+      actionview (= 4.1.1)
+      activemodel (= 4.1.1)
+      activerecord (= 4.1.1)
+      activesupport (= 4.1.1)
       bundler (>= 1.3.0, < 2.0)
-      railties (= 4.0.0)
-      sprockets-rails (~> 2.0.0)
-    railties (4.0.0)
-      actionpack (= 4.0.0)
-      activesupport (= 4.0.0)
+      railties (= 4.1.1)
+      sprockets-rails (~> 2.0)
+    railties (4.1.1)
+      actionpack (= 4.1.1)
+      activesupport (= 4.1.1)
       rake (>= 0.8.7)
       thor (>= 0.18.1, < 2.0)
-    rake (10.1.0)
+    rake (10.3.1)
     rspec (2.14.1)
       rspec-core (~> 2.14.0)
       rspec-expectations (~> 2.14.0)
       rspec-mocks (~> 2.14.0)
-    rspec-core (2.14.2)
-    rspec-expectations (2.14.0)
+    rspec-core (2.14.8)
+    rspec-expectations (2.14.5)
       diff-lcs (>= 1.1.3, < 2.0)
-    rspec-mocks (2.14.1)
-    rspec-rails (2.14.0)
+    rspec-mocks (2.14.6)
+    rspec-rails (2.14.2)
       actionpack (>= 3.0)
+      activemodel (>= 3.0)
       activesupport (>= 3.0)
       railties (>= 3.0)
       rspec-core (~> 2.14.0)
       rspec-expectations (~> 2.14.0)
       rspec-mocks (~> 2.14.0)
-    sequel (4.0.0)
-    simplecov (0.7.1)
-      multi_json (~> 1.0)
-      simplecov-html (~> 0.7.1)
-    simplecov-html (0.7.1)
-    sprockets (2.10.0)
+    sequel (4.10.0)
+    simplecov (0.8.2)
+      docile (~> 1.1.0)
+      multi_json
+      simplecov-html (~> 0.8.0)
+    simplecov-html (0.8.0)
+    sprockets (2.12.1)
       hike (~> 1.2)
       multi_json (~> 1.0)
       rack (~> 1.0)
       tilt (~> 1.1, != 1.3.0)
-    sprockets-rails (2.0.0)
+    sprockets-rails (2.1.3)
       actionpack (>= 3.0)
       activesupport (>= 3.0)
       sprockets (~> 2.8)
-    thor (0.18.1)
-    thread_safe (0.1.0)
-      atomic
+    thor (0.19.1)
+    thread_safe (0.3.3)
     tilt (1.4.1)
-    treetop (1.4.14)
+    treetop (1.4.15)
       polyglot
       polyglot (>= 0.3.1)
-    tzinfo (0.3.37)
+    tzinfo (1.1.0)
+      thread_safe (~> 0.1)
 
 PLATFORMS
   ruby

data/lib/query-interface-server/transformations.rb

@@ -51,8 +51,7 @@ module QueryInterface
         def auto_filter(*names)
           names.each do |name|
             self.filters[name] = Proc.new do |param|
-              field = "#{model.table_name}__#{name}".to_sym
-              filter(field => param)
+              filter(Sequel.qualify(model.table_name, name) => param)
             end
           end
         end

data/lib/query-interface-server/transformations/sequel_transformer.rb

@@ -27,31 +27,27 @@ module QueryInterface
         end
 
         def validate(transformation)
-          contraints = {
+          constraints = {
             filter: :collection, with: :collection,order: :collection,
             instance: :collection, context: :instance, map_ids: :collection,
             paginate: :collection, first: :collection, last: :collection, count: :collection
           }
           method = transformation['transformation'].to_sym
-          raise UnknownTransformation, "#{method}" unless contraints.has_key?(method)
+          raise UnknownTransformation, "#{method}" unless constraints.has_key?(method)
           param = transformation['parameter']
-          unless self.result_type == contraints[method]
+          unless self.result_type == constraints[method]
             raise InvalidContextException, "expected: #{description[:accepts]}, got: #{self.result_type}"
           end
           return [method, param]
         end
 
-        def table
-          self.result.model.table_name
-        end
-
         def default_order
           self.order(self.result.model.primary_key.to_s)
         end
 
         def id_selector
           primary_key = self.result.model.primary_key ? self.result.model.primary_key : :id
-          "#{self.result.model.table_name}__#{primary_key}".to_sym
+          Sequel.qualify(self.result.model.table_name, primary_key)
         end
 
         def filter(param)
@@ -90,7 +86,7 @@ module QueryInterface
         end
 
         def map_ids(param)
-          self.default_order.select(self.id_selector).map(&:id)
+          self.default_order.select_map(self.id_selector)
         end
 
         def count(param)

data/lib/query-interface-server/version.rb

@@ -1,7 +1,7 @@
 module QueryInterface
   module Server
 
-    VERSION = '1.0.4'
+    VERSION = '1.0.5'
 
   end
 end

data/query-interface-server.gemspec

@@ -23,7 +23,7 @@ Gem::Specification.new do |s|
   s.summary = "Server for the radar query interface"
   s.license = "ISC"
 
-  s.add_runtime_dependency(%q<sequel>, '~> 3.48')
+  s.add_runtime_dependency(%q<sequel>, '~> 4.10')
   s.add_development_dependency(%q<rake>, '~> 10.1')
   s.add_development_dependency(%q<rspec>, '~> 2.14')
   s.add_development_dependency(%q<rails>, '~> 4.0')

data/spec/lib/transformations_spec.rb

@@ -47,7 +47,7 @@ describe QueryInterface::Server::Transformations do
       transformations = Foo.instance_variable_get(:@query_transformations)
       transformations[:filter].keys.should eq([:foo, :bar])
       transformations[:filter][:foo].should be_a(Proc)
-      Foo.should_receive(:filter).with(foo_table__bar: 'bar_value')
+      Foo.should_receive(:filter).with(Sequel.qualify('foo_table', :bar) => 'bar_value')
       Foo.instance_exec('bar_value', &transformations[:filter][:bar])
     end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: query-interface-server
 version: !ruby/object:Gem::Version
-  version: 1.0.4
+  version: 1.0.5
 platform: ruby
 authors:
 - Andreas Kopecky <andreas.kopecky@radarservices.com>
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-04 00:00:00.000000000 Z
+date: 2014-05-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sequel
@@ -18,14 +18,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.48'
+        version: '4.10'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.48'
+        version: '4.10'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -126,9 +126,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.1
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Server for the radar query interface
 test_files: []
-has_rdoc: