query-interface-server 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c130d25257242b78e995068d4bce9cca150258f0
-  data.tar.gz: b15bcad3ca4ed37a0d549561813ade1d51c4b93f
+  metadata.gz: 304cbafb396d154cfcffef663d9e37d5b478fa65
+  data.tar.gz: 3b14bc4045f7ad6637eb5e7aeef72b11cb227a59
 SHA512:
-  metadata.gz: 8500c4301578ce5dc00384d92418c9d85286e66cb51fe4e8833e225c13e0c4de9f8bddb4c433656ca77fbc42fc125db5b415048af05484d73d31f22cece2c5e9
-  data.tar.gz: d5f67264a46094fc397048e1c34f4df38affa21db5e5aff1c96eecdda4cdae1b079206e01ae5cb1323ada1c845482ed77c7718a375217ce6bf4f7611ee555441
+  metadata.gz: 889f264e1d9e60fb0b3e7bc27d126c1c8c790fd17e2f141ce7f3c15b163151685fa4a0acbca594fe162a7a40a0625b1715a2b7fa1a0f801e25dff381a8014556
+  data.tar.gz: 1cd5efc902852da170dc3276cc2438ec05159a953181683fabaa290f1c99673f0e7bd71ed8e87d80a7a1a3bd6081eb2b2fc37d33a507355c05625f047aeefd71

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

@@ -16,7 +16,8 @@ module QueryInterface
 
       module InstanceMethods
 
-        attr_writer :context, :context_type
+        attr_writer :context_type
+        attr_accessor :context
 
         def validate_transformation(transformation)
           methods = {
@@ -43,10 +44,6 @@ module QueryInterface
           @context_type ||= :dataset
         end
 
-        def context
-          @context ||= query_model.filter.select_all(query_model.table_name)
-        end
-
         def id_selector
           primary_key = self.context.model.primary_key ? self.context.model.primary_key : :id
           "#{self.context.model.table_name}__#{primary_key}".to_sym
@@ -119,12 +116,12 @@ module QueryInterface
         end
 
         def query
+          @context = query_model.filter.select_all(query_model.table_name)
           transformations = params[:transformations] || []
           transformations = JSON.parse(transformations) unless transformations.is_a?(Array)
           transformations.each do |transformation|
-            method, param, context_type = self.validate_transformation(transformation)
+            method, param, self.context_type = self.validate_transformation(transformation)
             self.context = self.send(method, param)
-            self.context_type = context_type
           end
           self.context = self.default_order if self.context_type == :dataset
           respond_with(self.context)

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

@@ -1,7 +1,7 @@
 module QueryInterface
   module Server
 
-    VERSION = '0.1.1'
+    VERSION = '0.1.2'
 
   end
 end

data/spec/lib/query_interface_spec.rb

@@ -56,13 +56,6 @@ describe QueryInterface, type: :controller do
           controller.context.should eq(context)
         end
 
-        it "creates a new context if non is present" do
-          context = double("context")
-          controller.query_model.should_receive(:filter).and_return(foos)
-          foos.should_receive(:select_all).with(:foo_table).and_return(context)
-          controller.context.should eq(context)
-          assigns(:context).should eq(context)
-        end
       end
 
     end
@@ -150,6 +143,18 @@ describe QueryInterface, type: :controller do
           assigns(:context).should == filtered
           response.should be_ok
         end
+
+        it "creates a new context if none is present" do
+          context = double("context")
+          controller.query_model.should_receive(:filter).and_return(foos)
+          controller.stub(:default_order).and_return(context)
+          foos.should_receive(:select_all).with(:foo_table).and_return(context)
+
+          get :query, transformations: [], format: :json
+          controller.context.should eq(context)
+          assigns(:context).should eq(context)
+          response.should be_ok
+        end
       end
 
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: query-interface-server
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Andreas Kopecky <andreas.kopecky@radarservices.com>
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-11 00:00:00.000000000 Z
+date: 2013-10-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sequel