httpsql 0.1.0 → 0.1.1

data/README.md

@@ -36,6 +36,7 @@ Assume you have a model, widget, whose fields are id, int_field, string_field, c
 
     create_table "widgets", :force => true do |t|
       t.integer  "int_field"
+      t.float    "dec_field"
       t.string   "string_field"
       t.datetime "created_at", :null => false
       t.datetime "updated_at", :null => false
@@ -45,7 +46,7 @@ Assume you have a model, widget, whose fields are id, int_field, string_field, c
 
     class Widget < ActiveRecord::Base
       include Httpsql
-      attr_accessible :int_field, :string_field
+      attr_accessible :int_field, :dec_field, :string_field
     end
 
 ### api.rb
@@ -98,6 +99,18 @@ Query your new API
     curl 'http://localhost:3000/api/v1/widgets?id[]=1&id[]=2&created_at.gt=2013-06-01&fields[]=id&fields[]=int_field'
     SELECT id, int_field FROM widgets WHERE id IN (1,2) AND created_at > '2013-06-01'
 
+    curl 'http://localhost:3000/api/v1/widgets?int_field.sum'
+    SELECT SUM(int_field) AS int_field FROM widgets
+
+    curl 'http://localhost:3000/api/v1/widgets?int_field.maximum'
+    SELECT MAX(int_field) AS int_field FROM widgets
+
+    curl 'http://localhost:3000/api/v1/widgets?int_field.minimum'
+    SELECT MIN(int_field) AS int_field FROM widgets
+
+    curl 'http://localhost:3000/api/v1/widgets?dec_field.round=1'
+    SELECT ROUND(dec_field, 1) AS dec_field FROM widgets
+
     curl 'http://localhost:3000/api/v1/describe_api'
     Returns JSON describing the API
 

data/Rakefile

@@ -2,7 +2,7 @@ require "bundler/gem_tasks"
 require 'rake/testtask'
 
 Rake::TestTask.new do |t|
-  t.libs.push "lib"
+  t.libs.push "test"
   t.test_files = FileList["test/*_test.rb"]
   t.verbose = true
 end

data/lib/httpsql.rb

@@ -7,20 +7,32 @@ module Httpsql
 
   module ClassMethods
     def where_params_eq(params={})
-      cond = valid_params(params).map do |k,v|
+      fields = params[:field] || []
+      conds = []
+
+      valid_params(params).each do |k,v|
         (k, m) = k.to_s.split('.')
         next if k.to_s == 'access_token' 
         if m
-          arel_table[k.to_sym].send(m.to_sym, v)
+          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?)
-          arel_table[k.to_sym].in(v)
+          conds << arel_table[k].in(v)
         else
-          arel_table[k.to_sym].eq(v)
+          conds << arel_table[k].eq(v)
         end
-      end.inject{|x,y| x.and(y)}
+      end
+
+      conds = conds.compact.inject{|x,y| x.and(y)}
 
-      ar_rel = where(cond)
-      ar_rel = ar_rel.select(params[:field]) if params[:field]
+      ar_rel = where(conds)
+      ar_rel = ar_rel.select(fields) if fields.any?
       ar_rel
     end
 
@@ -45,3 +57,4 @@ module Httpsql
     end
   end
 end
+

data/lib/httpsql/version.rb

@@ -1,3 +1,3 @@
 module Httpsql
-  VERSION = "0.1.0"
+  VERSION = "0.1.1"
 end

data/test/httpsql_test.rb

@@ -1,34 +1,12 @@
-require 'minitest/spec'
-require 'minitest/autorun'
-require 'active_record'
-require 'httpsql'
-
-ActiveRecord::Base.configurations[:test] = {adapter:  'sqlite3', database: 'tmp/httpsql_test'}
-ActiveRecord::Base.establish_connection(ActiveRecord::Base.configurations[:test])
-ActiveRecord::Base.connection.execute %Q{ DROP TABLE IF EXISTS foo_models }
-ActiveRecord::Base.connection.execute %Q{ 
-  CREATE TABLE foo_models (
-    id integer,
-    int_field integer,
-    string_field text,
-    access_token text,
-    created_at text default CURRENT_TIMESTAMP,
-    updated_at text default CURRENT_TIMESTAMP,
-    primary key(id)
-  );
-}
-class FooModel < ActiveRecord::Base
-  include Httpsql
-  attr_accessible :int_field, :string_field, :access_token
-end
+require 'test_helper'
 
 def generate_models
   FooModel.create!([
-    {int_field: 0, string_field: "zero",  access_token: "000"},
-    {int_field: 1, string_field: "one",   access_token: "111"},
-    {int_field: 2, string_field: "two",   access_token: "222"},
-    {int_field: 3, string_field: "three", access_token: "333"},
-    {int_field: 4, string_field: "four",  access_token: "444"},
+    {int_field: 0, dec_field: 0.01, string_field: "zero",  access_token: "000"},
+    {int_field: 1, dec_field: 1.01, string_field: "one",   access_token: "111"},
+    {int_field: 2, dec_field: 2.01, string_field: "two",   access_token: "222"},
+    {int_field: 3, dec_field: 3.01, string_field: "three", access_token: "333"},
+    {int_field: 4, dec_field: 4.01, string_field: "four",  access_token: "444"},
   ])
 end
 
@@ -112,10 +90,35 @@ describe Httpsql do
     FooModel.where_params_eq("int_field.eq" => 0, field: [:int_field, :id]).must_equal model
   end
 
+  it 'sums the specified field' do
+    models = generate_models
+    expected = models.collect(&:int_field).inject(:+)
+    FooModel.where_params_eq("int_field.sum" => nil).first.int_field.must_equal expected
+  end
+
+  it 'selects the maximum value for the specified field' do
+    models = generate_models
+    expected = models.collect(&:int_field).max
+    FooModel.where_params_eq("int_field.maximum" => nil).first.int_field.must_equal expected
+  end
+
+  it 'selects the minimum value for the specified field' do
+    models = generate_models
+    expected = models.collect(&:int_field).min
+    FooModel.where_params_eq("int_field.minimum" => nil).first.int_field.must_equal expected
+  end
+
+  it 'generates the specified sql for rounding' do
+    models = generate_models
+    expected = models.collect(&:dec_field).map{|v| v.round.to_f}
+    FooModel.where_params_eq("dec_field.round" => "1").collect(&:dec_field).map{|v| v.to_f}.must_equal expected
+  end
+
   it 'generates the correct documentation' do
     FooModel.route_params.must_equal({
       "id"           => {:type => "integer", :desc => "id",            :primary => true},
       "int_field"    => {:type => "integer", :desc => "int_field",     :primary => false},
+      "dec_field"    => {:type => "decimal", :desc => "dec_field",     :primary => false},
       "string_field" => {:type => "text",    :desc => "string_field",  :primary => false},
       "access_token" => {:type => "text",    :desc => "access_token",  :primary => false},
       "created_at"   => {:type => "text",    :desc => "created_at",    :primary => false},

data/test/test_helper.rb

@@ -0,0 +1,25 @@
+require 'minitest/spec'
+require 'minitest/autorun'
+require 'active_record'
+require 'httpsql'
+
+ActiveRecord::Base.configurations[:test] = {adapter:  'sqlite3', database: 'tmp/httpsql_test'}
+ActiveRecord::Base.establish_connection(ActiveRecord::Base.configurations[:test])
+ActiveRecord::Base.connection.execute %Q{ DROP TABLE IF EXISTS foo_models }
+ActiveRecord::Base.connection.execute %Q{ 
+  CREATE TABLE foo_models (
+    id integer,
+    int_field integer,
+    dec_field decimal,
+    string_field text,
+    access_token text,
+    created_at text default CURRENT_TIMESTAMP,
+    updated_at text default CURRENT_TIMESTAMP,
+    primary key(id)
+  );
+}
+class FooModel < ActiveRecord::Base
+  include Httpsql
+  attr_accessible :int_field, :dec_field, :string_field, :access_token
+end
+

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: httpsql
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
   prerelease: 
 platform: ruby
 authors:
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-03 00:00:00.000000000 Z
+date: 2013-07-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -112,6 +112,7 @@ files:
 - lib/httpsql.rb
 - lib/httpsql/version.rb
 - test/httpsql_test.rb
+- test/test_helper.rb
 homepage: https://github.com/Adaptly/httpsql
 licenses:
 - MIT
@@ -140,3 +141,4 @@ summary: Select model specified fields, create arbitrary queries, all using CGI
   parameters
 test_files:
 - test/httpsql_test.rb
+- test/test_helper.rb