httpsql 0.2.0 → 0.2.1

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: ecd738cb6e2b72ec0c1c9c5009bc4d1f80690fa5
+  data.tar.gz: ebef5dd428014540bdac0bf04405b303a0a982d5
+SHA512:
+  metadata.gz: e3659684b60c1798e2bc76b7897646c5af887e7655e345a0aa2698f24b001fe6d130d6bc20f3dcd85a47566298d743fdd6112f53c5fc4e01382a7b7bffd307be
+  data.tar.gz: ad9ae77fc0eac32037f3925e979100e5d8802bc51fcec16a37b5246e4a7cb6784011e03b176f9e003ac2020742cead79aeb915bc5edbf1187062c4d58cd7db9e

data/.ruby-version

@@ -0,0 +1 @@
+2.0.0-p0

data/httpsql.gemspec

@@ -18,7 +18,7 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
-  spec.add_dependency "activerecord", "~> 3.2"
+  spec.add_dependency "activerecord", ">= 3.2"
   spec.add_dependency "arel", ">= 2.2"
   spec.add_dependency "grape", ">= 0.5.0"
   spec.add_development_dependency "bundler", "~> 1.3"

data/lib/httpsql/version.rb

@@ -1,3 +1,3 @@
 module Httpsql
-  VERSION = "0.2.0"
+  VERSION = "0.2.1"
 end

data/lib/httpsql.rb

@@ -16,47 +16,36 @@ module Httpsql
     #     end
     #   end
     def with_params(params={})
-      fields = []
-      conds  = []
-      joins  = []
-      groups = []
-      orders = []
+      @httpsql_params = params
+      @httpsql_conds  = []
 
-      fields += Array(params[:field] || params['field'])
+      @httpsql_fields = httpsql_fetch_param :field
+      joins  = httpsql_extract_joins
+      groups = httpsql_extract_groups
+      orders = httpsql_extract_orders
 
-      httpsql_valid_params(params).each do |k,v|
+      httpsql_valid_params.each do |k,v|
         k, m = k.to_s.split('.')
         next if k.to_s == 'access_token' 
 
-        if k == 'join'
-          joins += Array(v).map!(&:to_sym)
-        elsif k == 'order'
-          orders += Array(v).map!{|w| httpsql_quote_value_with_args(w)}
-        elsif k == 'group'
-          groups += Array(v).map!{|w| httpsql_quote_value(w)}
-        elsif m
-          if %w(sum minimum maximum).include?(m)
-            fields << arel_table[k].send(m).as(k)
-          elsif !arel_table[k].respond_to?(m)
-            args = v.split(',')
-            fields << Arel::Nodes::NamedFunction.new(m, [arel_table[k], *args], k)
-          else
-            conds << arel_table[k].send(m, v)
-          end
-        elsif v.respond_to?(:any?)
-          conds << arel_table[k].in(v)
+        # column.sum, column.function=arg1, column.predicate=x
+        if m
+          httpsql_extract_method(k, m, v)
+
+        # column[]=1&column[]=2 or column=x
         else
-          conds << arel_table[k].eq(v)
+          httpsql_extract_default_predicates(k, v)
         end
+
       end
 
-      conds = conds.compact.inject{|x,y| x.and(y)}
+      @httpsql_conds = @httpsql_conds.inject{|x,y| x.and(y)}
 
-      ar_rel = where(conds)
-      ar_rel = ar_rel.joins(joins)   if joins.any?
-      ar_rel = ar_rel.group(groups)  if groups.any?
-      ar_rel = ar_rel.order(orders)  if orders.any?
-      ar_rel = ar_rel.select(fields) if fields.any?
+      ar_rel = where(@httpsql_conds)
+      ar_rel = ar_rel.select(@httpsql_fields) if @httpsql_fields.any?
+      ar_rel = ar_rel.joins(joins)  if joins.any?
+      ar_rel = ar_rel.group(groups) if groups.any?
+      ar_rel = ar_rel.order(orders) if orders.any?
       ar_rel
     end
 
@@ -82,8 +71,8 @@ module Httpsql
     end
 
     private
-    def httpsql_valid_params(params)
-      params.select{|k,v| [*column_names, 'join', 'group', 'order'].include?(k.to_s.split('.').first)}
+    def httpsql_valid_params
+      @httpsql_params.select{|k,v| column_names.include?(k.to_s.split('.').first)}
     end
 
     def httpsql_quote_value(v)
@@ -118,6 +107,53 @@ module Httpsql
       @join_tables ||= reflections.keys
     end
 
+    def httpsql_fetch_param(key)
+      key_s = key.to_s
+      key_sym = key.to_sym
+      Array(@httpsql_params[key_sym] || @httpsql_params[key_s])
+    end
+
+    def httpsql_extract_joins
+      httpsql_fetch_param(:join).map!(&:to_sym)
+    end
+
+    def httpsql_extract_groups
+      httpsql_fetch_param(:group).map! do |w|
+        httpsql_quote_value(w)
+      end
+    end
+
+    def httpsql_extract_orders
+      httpsql_fetch_param(:order).map! do |w|
+        httpsql_quote_value_with_args(w)
+      end
+    end
+
+    def httpsql_extract_method(key, method, value)
+      # column.sum, column.minimum, column.maximum
+      if %w(sum minimum maximum).include?(method)
+        @httpsql_fields << arel_table[key].send(method).as(key)
+      # column.function=arg1,arg2
+      elsif !arel_table[key].respond_to?(method)
+        args = value.split(',')
+        @httpsql_fields << Arel::Nodes::NamedFunction.new(method, [arel_table[key], *args], key)
+      # column.arel_predicate (ie lt, gt, not_eq, etc)
+      else
+        @httpsql_conds << arel_table[key].send(method, value)
+      end
+    end
+
+    def httpsql_extract_default_predicates(key, value)
+      # column[]=1&column[]=2
+      if value.respond_to?(:any?)
+        @httpsql_conds << arel_table[key].in(value)
+
+      # column=1
+      else
+        @httpsql_conds << arel_table[key].eq(value)
+      end
+    end
+
   end
 end
 

data/test/httpsql_test.rb

@@ -35,14 +35,26 @@ describe Httpsql do
 
   describe "#httpsql_valid_params" do
     it 'selects a model\'s columns from a given hash' do
-      ret = FooModel.send(:httpsql_valid_params, id: 1, int_field: 2, string_field: "foo", access_token: "a", created_at: '2013-01-01T00:00:00', created_at: '2013-01-01T00:00:00', foo: :bar)
+      FooModel.instance_variable_set(:@httpsql_params, id: 1, int_field: 2, string_field: "foo", access_token: "a", created_at: '2013-01-01T00:00:00', created_at: '2013-01-01T00:00:00', foo: :bar)
+      ret = FooModel.send(:httpsql_valid_params)
       ret.must_equal(id: 1, int_field: 2, string_field: "foo", access_token: "a", created_at: '2013-01-01T00:00:00', created_at: '2013-01-01T00:00:00')
     end
+  end
+
+  describe "#httpsql_fetch_param" do
 
-    it 'selects reserved parameters' do
-      ret = FooModel.send(:httpsql_valid_params, 'join'=>'foo', 'group'=>'bar', 'order'=>'baz')
-      ret.must_equal('join'=>'foo', 'group'=>'bar', 'order'=>'baz')
+    it "fetches symbol keys and converts values to an array" do
+      FooModel.instance_variable_set(:@httpsql_params, "id" => 1)
+      result = FooModel.send(:httpsql_fetch_param, :id)
+      result.must_equal [1]
     end
+
+    it "fetches string keys and converts values to an array" do
+      FooModel.instance_variable_set(:@httpsql_params, id: 1)
+      result = FooModel.send(:httpsql_fetch_param, "id")
+      result.must_equal [1]
+    end
+
   end
 
   describe '#with_params' do
@@ -143,7 +155,7 @@ describe Httpsql do
     it 'groups correctly' do
       models = generate_foo_models
       expected = [FooModel.create({created_at: "1900-01-01"}), models.last]
-      FooModel.with_params("group" => "created_at").must_equal expected
+      FooModel.with_params("group" => "created_at").to_a.must_equal expected
     end
 
     it 'orders unqualified fields correctly' do

metadata

@@ -1,8 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: httpsql
 version: !ruby/object:Gem::Version
-  version: 0.2.0
-  prerelease: 
+  version: 0.2.1
 platform: ruby
 authors:
 - Philip Champon
@@ -11,60 +10,53 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-23 00:00:00.000000000 Z
+date: 2013-07-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
         version: '3.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
         version: '3.2'
 - !ruby/object:Gem::Dependency
   name: arel
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '2.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '2.2'
 - !ruby/object:Gem::Dependency
   name: grape
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 0.5.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 0.5.0
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -72,7 +64,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -80,23 +71,20 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: coveralls
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 0.5.7
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 0.5.7
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -104,7 +92,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -112,65 +99,57 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: pry-nav
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0.7'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0.7'
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 description: Expose model columns and ARel methods through query parameters in grape
@@ -185,6 +164,7 @@ extra_rdoc_files: []
 files:
 - .coveralls.yml
 - .gitignore
+- .ruby-version
 - .travis.yml
 - Gemfile
 - LICENSE.txt
@@ -202,27 +182,26 @@ files:
 homepage: https://github.com/Adaptly/httpsql
 licenses:
 - MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 2.0.0
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Select model specified fields, create arbitrary queries, all using CGI query
   parameters
 test_files: