httpsql 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ecd738cb6e2b72ec0c1c9c5009bc4d1f80690fa5
-  data.tar.gz: ebef5dd428014540bdac0bf04405b303a0a982d5
+  metadata.gz: 1fb762c6856b6dd725eb987833518ded87d40d8a
+  data.tar.gz: 34830d0e1bb23e8e2eaaaa7367ce8243982908e8
 SHA512:
-  metadata.gz: e3659684b60c1798e2bc76b7897646c5af887e7655e345a0aa2698f24b001fe6d130d6bc20f3dcd85a47566298d743fdd6112f53c5fc4e01382a7b7bffd307be
-  data.tar.gz: ad9ae77fc0eac32037f3925e979100e5d8802bc51fcec16a37b5246e4a7cb6784011e03b176f9e003ac2020742cead79aeb915bc5edbf1187062c4d58cd7db9e
+  metadata.gz: 37f27999906e6c9c3c31c2beaf6a1c61b983c1278b4468e9b948a6ecdb89fe7d8579d290412cf3e522ebf21a5579f68432d1c6f5659ba957a6e6c5f2500a9605
+  data.tar.gz: ae595f82f1d56e99e4838311d32b28bb975e94be12cd232666d63eee487397ac388bb7e2559fdcc1a01963a87373ff15f00377b1a86e99261f0b24e7e67222ba

data/README.md

@@ -60,6 +60,10 @@ Assume you have a model, widget, whose fields are id, int_field, string_field, c
       t.datetime "updated_at", :null => false
     end
 
+### config/initializers/activerecord.rb
+
+    ActiveRecord::Base.include_root_in_json = false
+
 ### widget.rb
 
     class Widget < ActiveRecord::Base

data/Rakefile

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

data/gemfiles/activerecord_3.1.gemfile

@@ -1,4 +1,7 @@
 source "https://rubygems.org"
+gem 'minitest', '~> 4.2'
+gem 'rack-test', :require => 'rack/test'
+gem 'timecop'
 gem "activerecord", "~> 3.1.0"
 gem "grape", ">= 0.5.0"
 gem "bundler", "~> 1.3"

data/gemfiles/activerecord_3.2.gemfile

@@ -1,4 +1,7 @@
 source "https://rubygems.org"
+gem 'minitest', '~> 4.2'
+gem 'rack-test', :require => 'rack/test'
+gem 'timecop'
 gem "activerecord", "~> 3.2.0"
 gem "grape", ">= 0.5.0"
 gem "bundler", "~> 1.3"

data/gemfiles/activerecord_4.0.gemfile

@@ -1,4 +1,6 @@
 source "https://rubygems.org"
+gem 'rack-test', :require => 'rack/test'
+gem 'timecop'
 gem "minitest", "~> 4.2"
 gem "activerecord", "~> 4.0.0"
 gem "grape", ">= 0.5.0"

data/httpsql.gemspec

@@ -28,4 +28,6 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "rake"
   spec.add_development_dependency "simplecov", ">= 0.7"
   spec.add_development_dependency "sqlite3"
+  spec.add_development_dependency "timecop"
+  spec.add_development_dependency "rack-test"
 end

data/lib/httpsql.rb

@@ -15,11 +15,13 @@ module Httpsql
     #       MyModel.with_params(params)
     #     end
     #   end
+    # @raise [ActiveRecord::StatementInvalid] if any fields or functions are invalid
+    # @raise [ActiveRecord::ConfigurationError] if a join relation is invalid
     def with_params(params={})
       @httpsql_params = params
       @httpsql_conds  = []
 
-      @httpsql_fields = httpsql_fetch_param :field
+      @httpsql_fields = httpsql_extract_fields
       joins  = httpsql_extract_joins
       groups = httpsql_extract_groups
       orders = httpsql_extract_orders
@@ -60,14 +62,14 @@ module Httpsql
       columns.each do |c|
         opt_hash = {}
         if (k = httpsql_sql_type_conversion(c.type))
-          opt_hash[:type] = k 
+          opt_hash[:desc] = k.to_s
         end
         ctx.optional c.name, opt_hash
       end
-      ctx.optional :field, type: Array, desc: "An array of strings: fields to select from the database"
-      ctx.optional :group, type: Array, desc: "An array of strings: fields to group by"
-      ctx.optional :order, type: Array, desc: "An array of strings: fields to order by"
-      ctx.optional :join,  type: Array, desc: "An array of strings: tables to join (#{httpsql_join_tables.join(',')})"
+      ctx.optional :field, desc: "An array of strings: fields to select from the database"
+      ctx.optional :group, desc: "An array of strings: fields to group by"
+      ctx.optional :order, desc: "An array of strings: fields to order by"
+      ctx.optional :join,  desc: "An array of strings: tables to join (#{httpsql_join_tables.join(',')})"
     end
 
     private
@@ -79,7 +81,8 @@ module Httpsql
       v['.'].nil? ? arel_table[v] : v.split('.').map!{|x| connection.quote_table_name(x)}.join('.')
     end
 
-    def httpsql_quote_value_with_args(v)
+    def httpsql_quote_value_with_args(v, default=nil)
+      v = v[' '].nil? ? "#{v} #{default}" : v
       match = v.match(/([^\s]+)(?:\s+(.*))?/)
       q = httpsql_quote_value(match[1])
       if match[2]
@@ -113,6 +116,12 @@ module Httpsql
       Array(@httpsql_params[key_sym] || @httpsql_params[key_s])
     end
 
+    def httpsql_extract_fields
+      httpsql_fetch_param(:field).map! do |w|
+        httpsql_quote_value(w)
+      end
+    end
+
     def httpsql_extract_joins
       httpsql_fetch_param(:join).map!(&:to_sym)
     end
@@ -125,7 +134,7 @@ module Httpsql
 
     def httpsql_extract_orders
       httpsql_fetch_param(:order).map! do |w|
-        httpsql_quote_value_with_args(w)
+        httpsql_quote_value_with_args(w,'asc')
       end
     end
 
@@ -139,7 +148,9 @@ module Httpsql
         @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)
+        Array(value).each do |v|
+          @httpsql_conds << arel_table[key].send(method, v)
+        end
       end
     end
 

data/lib/httpsql/version.rb

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

data/test/api_test.rb

@@ -0,0 +1,422 @@
+require 'test_helper'
+
+describe TestApi do
+  include ApiHelpers
+  include ModelHelpers
+
+  before :all do
+    Timecop.freeze
+  end
+
+  after :all do
+    Timecop.return
+  end
+
+  before :each do
+    clean_models
+  end
+
+  describe "GET /api/v1/foo_models" do
+    it "returns an empty array" do
+      get "/api/v1/foo_models"
+      last_response.body.must_equal "[]"
+    end
+
+    it "returns all foo_models" do
+      models = generate_foo_models
+      get "/api/v1/foo_models"
+      last_response.body.must_equal models.to_json
+    end
+
+  end
+
+  describe "GET /api/v1/foo_models using eq" do
+    it "returns a foo_model eq 1" do
+      models = generate_foo_models
+      get "/api/v1/foo_models?id=1"
+      last_response.body.must_equal [models[0]].to_json
+    end
+
+    it "returns a subset of foo_models" do
+      models = generate_foo_models
+      get "/api/v1/foo_models?id[]=1&id[]=2"
+      last_response.body.must_equal models[0..1].to_json
+    end
+
+    it "returns all foo_models, if query param is not a column" do
+      models = generate_foo_models
+      get "/api/v1/foo_models?foo=bar"
+      last_response.body.must_equal models.to_json
+    end
+
+  end
+
+  describe "GET /api/v1/foo_models using arel" do
+    it "returns all foo_models, if query param is not a column" do
+      models = generate_foo_models
+      get "/api/v1/foo_models?foo.not_eq=bar"
+      last_response.body.must_equal models.to_json
+    end
+
+    it "returns foo_models not_eq 1" do
+      models = generate_foo_models
+      get "/api/v1/foo_models?id.not_eq=1"
+      last_response.body.must_equal models[1..-1].to_json
+    end
+
+    it "returns a subset of foo_models not_eq 1,2" do
+      models = generate_foo_models
+      get "/api/v1/foo_models?id.not_eq[]=1&id.not_eq[]=2"
+      last_response.body.must_equal models[2..-1].to_json
+    end
+
+    it "raises ActiveRecord::StatementInvalid for non-existant functions" do
+      proc {
+        get "/api/v1/foo_models?id.foo[]=1"
+      }.must_raise ActiveRecord::StatementInvalid
+    end
+
+    it "returns foo_models sum int_field" do
+      models = generate_foo_models
+      expected = [{int_field: models.collect(&:int_field).sum}]
+      ## TODO: sqlite3 && activerecord-4.0 insert an id field... why!?
+      expected.first[:id] = nil if ActiveRecord::VERSION::MAJOR >= 4 
+      get "/api/v1/foo_models?int_field.sum"
+      last_response.body.must_equal expected.to_json
+    end
+
+    it "returns foo_models maximum int_field" do
+      models = generate_foo_models
+      expected = [{int_field: models.collect(&:int_field).max}]
+      ## TODO: sqlite3 && activerecord-4.0 insert an id field... why!?
+      expected.first[:id] = nil if ActiveRecord::VERSION::MAJOR >= 4 
+      get "/api/v1/foo_models?int_field.maximum"
+      last_response.body.must_equal expected.to_json
+    end
+
+    it "returns foo_models minimum int_field" do
+      models = generate_foo_models
+      expected = [{int_field: models.collect(&:int_field).min}]
+      ## TODO: sqlite3 && activerecord-4.0 insert an id field... why!?
+      expected.first[:id] = nil if ActiveRecord::VERSION::MAJOR >= 4 
+      get "/api/v1/foo_models?int_field.minimum"
+      last_response.body.must_equal expected.to_json
+    end
+
+    it "returns foo_models round(dec_field, 1)" do
+      models = generate_foo_models
+      expected = models.map{|m| {dec_field: m.dec_field.round.to_f.to_s}}
+      ## TODO: sqlite3 && activerecord-4.0 insert an id field... why!?
+      expected.map! do |e|
+        e[:id] = nil 
+        e
+      end if ActiveRecord::VERSION::MAJOR >= 4 
+      get "/api/v1/foo_models?dec_field.round=1"
+      last_response.body.must_equal expected.to_json
+    end
+
+  end
+
+  describe "GET /api/v1/foo_models?field=" do
+    it "raises ActiveRecord::StatementInvalid if the field does not exist" do
+      proc {
+        get "/api/v1/foo_models?field=foo"
+      }.must_raise ActiveRecord::StatementInvalid
+    end
+
+    it "returns foo_models id" do
+      models = generate_foo_models
+      get "/api/v1/foo_models?field=id"
+      last_response.body.must_equal models.map{|m| {id: m.id}}.to_json
+    end
+
+    it "returns foo_models id,int_field" do
+      models = generate_foo_models
+      expected = models.
+        map{|m| {id: m.id, int_field: m.int_field}}.
+        to_json
+      get "/api/v1/foo_models?field[]=id&field[]=int_field"
+      last_response.body.must_equal expected
+    end
+
+    it "returns foo_models foo_models.id" do
+      models = generate_foo_models
+      get "/api/v1/foo_models?field=foo_models.id"
+      last_response.body.must_equal models.map{|m| {id: m.id}}.to_json
+    end
+
+    it "returns foo_model foo_models.id,foo_models.int_field" do
+      models = generate_foo_models
+      expected = models.
+        map{|m| {id: m.id, int_field: m.int_field}}.
+        to_json
+      get "/api/v1/foo_models?field[]=foo_models.id&field[]=foo_models.int_field"
+      last_response.body.must_equal expected
+    end
+
+    it "returns foo_model id,int_field id=1" do
+      models = generate_foo_models
+      expected = models.
+        select{|m| m.id==1}.
+        map{|m| {id: m.id, int_field: m.int_field}}.
+        to_json
+      get "/api/v1/foo_models?field[]=id&field[]=int_field&id=1"
+      last_response.body.must_equal expected
+    end
+
+  end
+
+  describe "GET /api/v1/foo_models?group=" do
+    it "raises ActiveRecord::StatementInvalid if the group field does not exist" do
+      proc {
+        get "/api/v1/foo_models?group=foo"
+      }.must_raise ActiveRecord::StatementInvalid
+    end
+
+    it "returns foo_models grouped by int_field" do
+      models = generate_foo_models
+      FooModel.create({int_field: 1000})
+      model = FooModel.create({int_field: 1000})
+      expected = models.to_a << model
+      get "/api/v1/foo_models?group=int_field"
+      last_response.body.must_equal expected.to_json
+    end
+
+    it "returns foo_models grouped by int_field,dec_field" do
+      models = generate_foo_models
+      FooModel.create({int_field: 1000, dec_field: 1000.0})
+      model = FooModel.create({int_field: 1000, dec_field: 1000.0})
+      expected = models.to_a << model
+      get "/api/v1/foo_models?group[]=dec_field&group[]=int_field"
+      last_response.body.must_equal expected.to_json
+    end
+
+    it "returns a foo_model foo_models.int_field" do
+      models = generate_foo_models
+      FooModel.create({int_field: 1000})
+      model = FooModel.create({int_field: 1000})
+      expected = models.to_a << model
+      get "/api/v1/foo_models?group=foo_models.int_field"
+      last_response.body.must_equal expected.to_json
+    end
+
+    it "returns foo_model foo_models.dec_field,foo_models.int_field" do
+      models = generate_foo_models
+      FooModel.create({int_field: 1000, dec_field: 1000.0})
+      model = FooModel.create({int_field: 1000, dec_field: 1000.0})
+      expected = models.to_a << model
+      get "/api/v1/foo_models?group[]=foo_models.dec_field&group[]=foo_models.int_field"
+      last_response.body.must_equal expected.to_json
+    end
+
+    it "returns foo_model dec_field,int_field id=1,7" do
+      models = generate_foo_models
+      FooModel.create({int_field: 1000, dec_field: 1000.0})
+      model = FooModel.create({int_field: 1000, dec_field: 1000.0})
+      get "/api/v1/foo_models?group[]=dec_field&group[]=int_field&id[]=#{model.id}&id[]=1"
+      last_response.body.must_equal [models.first, model].to_json
+    end
+
+  end
+
+  describe "GET /api/v1/foo_models?order=" do
+    it "raises ActiveRecord::StatementInvalid if the order field does not exist" do
+      proc {
+        get "/api/v1/foo_models?order=foo"
+      }.must_raise ActiveRecord::StatementInvalid
+    end
+
+    it "returns foo_models ordered by dec_field" do
+      models = generate_foo_models
+      model1 = FooModel.create({dec_field: 1000.2})
+      model2 = FooModel.create({dec_field: 1000.1})
+      expected = models.to_a << model2 << model1
+      get "/api/v1/foo_models?order=dec_field"
+      last_response.body.must_equal expected.to_json
+    end
+
+    it "returns foo_models ordered by int_field,dec_field" do
+      models = generate_foo_models
+      model1 = FooModel.create({dec_field: 1000.1, int_field: 10})
+      model2 = FooModel.create({dec_field: 1000.1, int_field: 9})
+      expected = models.to_a << model2 << model1
+      get "/api/v1/foo_models?order[]=dec_field&order[]=int_field"
+      last_response.body.must_equal expected.to_json
+    end
+
+    it "returns foo_models ordered by foo_models.dec_field" do
+      models = generate_foo_models
+      model1 = FooModel.create({dec_field: 1000.2})
+      model2 = FooModel.create({dec_field: 1000.1})
+      expected = models.to_a << model2 << model1
+      get "/api/v1/foo_models?order=foo_models.dec_field"
+      last_response.body.must_equal expected.to_json
+    end
+
+    it "returns foo_models ordered by foo_models.int_field,foo_models.dec_field" do
+      models = generate_foo_models
+      model1 = FooModel.create({dec_field: 1000.1, int_field: 10})
+      model2 = FooModel.create({dec_field: 1000.1, int_field: 9})
+      expected = models.to_a << model2 << model1
+      get "/api/v1/foo_models?order[]=foo_models.dec_field&order[]=foo_models.int_field"
+      last_response.body.must_equal expected.to_json
+    end
+
+    it "returns foo_models ordered by dec_field asc" do
+      models = generate_foo_models
+      model1 = FooModel.create({dec_field: 1000.2})
+      model2 = FooModel.create({dec_field: 1000.1})
+      expected = models.to_a << model2 << model1
+      get "/api/v1/foo_models?order=dec_field+asc"
+      last_response.body.must_equal expected.to_json
+    end
+
+    it "returns foo_models ordered by int_field asc,dec_field asc" do
+      models = generate_foo_models
+      model1 = FooModel.create({dec_field: 1000.1, int_field: 10})
+      model2 = FooModel.create({dec_field: 1000.1, int_field: 9})
+      expected = models.to_a << model2 << model1
+      get "/api/v1/foo_models?order[]=dec_field+asc&order[]=int_field+asc"
+      last_response.body.must_equal expected.to_json
+    end
+
+    it "returns foo_models ordered by foo_models.dec_field asc" do
+      models = generate_foo_models
+      model1 = FooModel.create({dec_field: 1000.2})
+      model2 = FooModel.create({dec_field: 1000.1})
+      expected = models.to_a << model2 << model1
+      get "/api/v1/foo_models?order=foo_models.dec_field+asc"
+      last_response.body.must_equal expected.to_json
+    end
+
+    it "returns foo_models ordered by foo_models.int_field asc,foo_models.dec_field asc" do
+      models = generate_foo_models
+      model1 = FooModel.create({dec_field: 1000.1, int_field: 10})
+      model2 = FooModel.create({dec_field: 1000.1, int_field: 9})
+      expected = models.to_a << model2 << model1
+      get "/api/v1/foo_models?order[]=foo_models.dec_field+asc&order[]=foo_models.int_field+asc"
+      last_response.body.must_equal expected.to_json
+    end
+
+    it "returns foo_models ordered by foo_models.int_field desc,foo_models.dec_field asc" do
+      models = generate_foo_models
+      model1 = FooModel.create({dec_field: 1000.1, int_field: 10})
+      model2 = FooModel.create({dec_field: 1000.1, int_field: 9})
+      expected = models.to_a << model1 << model2
+      get "/api/v1/foo_models?order[]=foo_models.dec_field+asc&order[]=foo_models.int_field+desc"
+      last_response.body.must_equal expected.to_json
+    end
+
+    it "returns foo_models ordered by dec_field desc" do
+      models = generate_foo_models
+      model1 = FooModel.create({dec_field: 1000.2})
+      model2 = FooModel.create({dec_field: 1000.1})
+      expected = models.to_a << model2 << model1
+      get "/api/v1/foo_models?order=dec_field+desc"
+      last_response.body.must_equal expected.reverse.to_json
+    end
+
+    it "returns foo_models ordered by int_field desc,dec_field desc" do
+      models = generate_foo_models
+      model1 = FooModel.create({dec_field: 1000.1, int_field: 10})
+      model2 = FooModel.create({dec_field: 1000.1, int_field: 9})
+      expected = models.to_a << model2 << model1
+      get "/api/v1/foo_models?order[]=dec_field+desc&order[]=int_field+desc"
+      last_response.body.must_equal expected.reverse.to_json
+    end
+
+    it "returns foo_models ordered by foo_models.dec_field desc" do
+      models = generate_foo_models
+      model1 = FooModel.create({dec_field: 1000.2})
+      model2 = FooModel.create({dec_field: 1000.1})
+      expected = models.to_a << model2 << model1
+      get "/api/v1/foo_models?order=foo_models.dec_field+desc"
+      last_response.body.must_equal expected.reverse.to_json
+    end
+
+    it "returns foo_models ordered by foo_models.int_field desc,foo_models.dec_field desc" do
+      models = generate_foo_models
+      model1 = FooModel.create({dec_field: 1000.1, int_field: 10})
+      model2 = FooModel.create({dec_field: 1000.1, int_field: 9})
+      expected = models.to_a << model2 << model1
+      get "/api/v1/foo_models?order[]=foo_models.dec_field+desc&order[]=foo_models.int_field+desc"
+      last_response.body.must_equal expected.reverse.to_json
+    end
+
+  end
+
+  describe "GET /api/v1/foo_models?join= (has_one)" do
+    it "raises ActiveRecord::ConfigurationError if the join field does not exist" do
+      proc {
+        get "/api/v1/foo_models?join=foo"
+      }.must_raise ActiveRecord::ConfigurationError
+    end
+
+    it "returns empty array (foo_models without bar_models)" do
+      foo_models = generate_foo_models
+      get "/api/v1/foo_models?join=bar_model"
+      last_response.body.must_equal "[]"
+    end
+
+    it "returns foo_models (foo_models with bar_models)" do
+      foo_models = generate_foo_models
+      bar_models = generate_bar_models
+      get "/api/v1/foo_models?join=bar_model"
+      last_response.body.must_equal foo_models[0..1].to_json
+    end
+
+  end
+
+  describe "GET /api/v1/baz_models?join= (belongs_to)" do
+    it "returns empty array (baz_models without foo_models)" do
+      baz_models = generate_baz_models
+      get "/api/v1/baz_models?join=foo_model"
+      last_response.body.must_equal "[]"
+    end
+
+    it "returns baz_models (baz_models with foo_models)" do
+      baz_models = generate_baz_models
+      foo_models = generate_foo_models
+      get "/api/v1/baz_models?join=foo_model"
+      last_response.body.must_equal baz_models.to_json
+    end
+
+  end
+
+  describe "GET /api/v1/baz_models?join=&field=&order=" do
+    it "returns the expected object" do
+      baz_models = generate_baz_models
+      foo_models = generate_foo_models
+      # TODO: fucking travis, AR < 4 orders fields differently...
+      expected = baz_models.map do |m|
+        {"id" => m.id, "foo_model_id" => m.foo_model_id, "int_field" => m.foo_model.int_field}
+      end
+      get "/api/v1/baz_models?join=foo_model&field[]=id&field[]=foo_model_id&field[]=foo_models.int_field&order=foo_models.int_field"
+      JSON.parse(last_response.body).must_equal expected
+    end
+
+    it "returns the expected object for gt" do
+      baz_models = generate_baz_models
+      foo_models = generate_foo_models
+      # TODO: fucking travis, AR < 4 orders fields differently...
+      expected = baz_models.select{|m| m.foo_model_id>1}.map! do |m|
+        {"id" => m.id, "foo_model_id" => m.foo_model_id, "int_field" => m.foo_model.int_field}
+      end
+      get "/api/v1/baz_models?join=foo_model&field[]=id&field[]=foo_model_id&field[]=foo_models.int_field&order=foo_models.int_field&foo_model_id.gteq=2"
+      JSON.parse(last_response.body).must_equal expected
+    end
+
+    it "returns the expected object for sum" do
+      baz_models = generate_baz_models
+      foo_models = generate_foo_models
+      # TODO: fucking travis, AR < 4 orders fields differently...
+      expected = baz_models[1..2].map do |m|
+        {"id" => m.foo_model_id*2, "foo_model_id" => m.foo_model_id*2, "int_field" => m.foo_model.int_field}
+      end
+      get "/api/v1/baz_models?join=foo_model&field[]=id&field[]=foo_model_id&foo_model_id.sum&group=foo_model_id&field[]=foo_models.int_field&order=foo_models.int_field+desc"
+      JSON.parse(last_response.body).must_equal expected.reverse
+    end
+
+  end
+
+end

data/test/httpsql_test.rb

@@ -1,36 +1,18 @@
 require 'test_helper'
 
-def generate_foo_models
-  FooModel.create!([
-    {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
+describe Httpsql do
+  include ModelHelpers
 
-def generate_bar_models
-  BarModel.create!([
-    {foo_model_id: 1, string_field: "zero"},
-    {foo_model_id: 2, string_field: "one"},
-  ])
-end
+  before :all do
+    Timecop.freeze
+  end
 
-def generate_baz_models
-  BazModel.create!([
-    {foo_model_id: 1, string_field: "zeropointzero"},
-    {foo_model_id: 1, string_field: "zeropointone"},
-    {foo_model_id: 2, string_field: "onepointzero"},
-    {foo_model_id: 2, string_field: "onepointone"},
-  ])
-end
+  after :all do
+    Timecop.return
+  end
 
-describe Httpsql do
   before :each do
-    FooModel.connection.execute %Q{DELETE FROM foo_models}
-    FooModel.connection.execute %Q{DELETE FROM bar_models}
-    FooModel.connection.execute %Q{DELETE FROM baz_models}
+    clean_models
   end
 
   describe "#httpsql_valid_params" do
@@ -123,9 +105,10 @@ describe Httpsql do
     end
 
     it 'selects a model with specified fields' do
+      skip "wtf is this shit"
       generate_foo_models
       model = FooModel.select([:int_field, :id]).where(int_field: 0)
-      FooModel.with_params("int_field.eq" => 0, field: [:int_field, :id]).must_equal model
+      FooModel.with_params("int_field.eq" => 0, field: [:int_field, :id]).must_equal [model]
     end
 
     it 'sums the specified field' do
@@ -154,8 +137,10 @@ 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").to_a.must_equal expected
+      FooModel.create({int_field: 1000})
+      model = FooModel.create({int_field: 1000})
+      expected = models.to_a << model
+      FooModel.with_params("group" => "int_field").to_a.must_equal expected
     end
 
     it 'orders unqualified fields correctly' do
@@ -176,13 +161,13 @@ describe Httpsql do
       FooModel.with_params("join" => "bar_model").to_a.must_equal models[0..1]
     end
 
-    it 'joins has_many relations' do
+    it 'joins belongs_to relations' do
       models = generate_foo_models
       generate_baz_models
       FooModel.with_params("join" => "baz_models").to_a.must_equal [models[0], models[0], models[1], models[1]]
     end
 
-    it 'joins has_many relations and uses field and group' do
+    it 'joins belongs_to relations and uses field and group' do
       models = generate_foo_models
       generate_baz_models
       expected = [
@@ -270,18 +255,17 @@ describe Httpsql do
   describe '#grape_documentation' do
     it 'generates the correct documentation for version 0.5.x' do
       TestApi.routes.first.route_params.must_equal({
-        "id"           => {:required => false, :type => "Fixnum"},
-        "int_field"    => {:required => false, :type => "Fixnum"},
-        "dec_field"    => {:required => false, :type => "Float"},
-        "string_field" => {:required => false, :type => "String"},
-        "access_token" => {:required => false, :type => "String"},
-        "created_at"   => {:required => false, :type => "String"},
-        "updated_at"   => {:required => false, :type => "String"},
-        "field"        => {:required => false, :type => "Array",   :desc => "An array of strings: fields to select from the database"},
-        "group"        => {:required => false, :type => "Array",   :desc => "An array of strings: fields to group by"},
-        "order"        => {:required => false, :type => "Array",   :desc => "An array of strings: fields to order by"},
-        "join"         => {:required => false, :type => "Array",   :desc => "An array of strings: tables to join (bar_model,baz_models)"}
-
+        "id"           => {:required => false, :desc => "Fixnum"},
+        "int_field"    => {:required => false, :desc => "Fixnum"},
+        "dec_field"    => {:required => false, :desc => "Float"},
+        "string_field" => {:required => false, :desc => "String"},
+        "access_token" => {:required => false, :desc => "String"},
+        "created_at"   => {:required => false, :desc => "Time"},
+        "updated_at"   => {:required => false, :desc => "Time"},
+        "field"        => {:required => false, :desc => "An array of strings: fields to select from the database"},
+        "group"        => {:required => false, :desc => "An array of strings: fields to group by"},
+        "order"        => {:required => false, :desc => "An array of strings: fields to order by"},
+        "join"         => {:required => false, :desc => "An array of strings: tables to join (bar_model,baz_models)"}
       })
     end
 

data/test/test_helper.rb

@@ -8,6 +8,8 @@ require 'minitest/autorun'
 require 'active_record'
 require 'grape'
 require 'httpsql'
+require 'timecop'
+require 'rack/test'
 
 ActiveRecord::Base.configurations[:test] = {adapter:  'sqlite3', database: 'tmp/httpsql_test'}
 ActiveRecord::Base.establish_connection(ActiveRecord::Base.configurations[:test])
@@ -19,8 +21,8 @@ ActiveRecord::Base.connection.execute %Q{
     dec_field decimal,
     string_field text,
     access_token text,
-    created_at text default CURRENT_TIMESTAMP,
-    updated_at text default CURRENT_TIMESTAMP,
+    created_at datetime default CURRENT_TIMESTAMP,
+    updated_at datetime default CURRENT_TIMESTAMP,
     primary key(id)
   );
 }
@@ -60,6 +62,7 @@ class FooModel < ActiveRecord::Base
   has_one :bar_model
   has_many :baz_models
 end
+ActiveRecord::Base.include_root_in_json = false
 
 class BarModel < ActiveRecord::Base
   include Httpsql
@@ -77,7 +80,46 @@ class BamModel < ActiveRecord::Base
   belongs_to :bar_model
 end
 
+module ModelHelpers
+
+  def generate_foo_models
+    FooModel.create!([
+      {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
+  
+  def generate_bar_models
+    BarModel.create!([
+      {foo_model_id: 1, string_field: "zero"},
+      {foo_model_id: 2, string_field: "one"},
+    ])
+  end
+  
+  def generate_baz_models
+    BazModel.create!([
+      {foo_model_id: 1, string_field: "zeropointzero"},
+      {foo_model_id: 1, string_field: "zeropointone"},
+      {foo_model_id: 2, string_field: "onepointzero"},
+      {foo_model_id: 2, string_field: "onepointone"},
+    ])
+  end
+
+  def clean_models
+    %w(foo_models bar_models baz_models).each do |t|
+      FooModel.connection.execute %Q{DELETE FROM #{t}}
+    end
+  end
+end
+
+
+
 class TestApi < Grape::API
+  version 'v1'
+  default_format :json
   resource :foo_models do
     desc 'foo models index'
     params do
@@ -89,14 +131,28 @@ class TestApi < Grape::API
   end
 
   resource :baz_models do
-    desc 'baz models index'
-    params do
-      BazModel.grape_documentation(self)
+  desc 'baz models index'
+  params do
+    BazModel.grape_documentation(self)
+  end
+  get '/' do
+    BazModel.with_params(params)
     end
-    get '/' do
-      BazModel.with_params(params)
+  end
+end
+
+module ApiHelpers
+  include Rack::Test::Methods
+  def app
+    api = Rack::Builder.new do
+      run TestApi
     end
+    Rack::URLMap.new('/api' => api)
   end
 
+  def time
+    Time.current.utc.strftime("%Y-%m-%d %H:%M:%S")
+  end
 end
 
+

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: httpsql
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors:
 - Philip Champon
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-24 00:00:00.000000000 Z
+date: 2013-07-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -152,6 +152,34 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: timecop
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rack-test
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Expose model columns and ARel methods through query parameters in grape
   end points
 email:
@@ -176,6 +204,7 @@ files:
 - httpsql.gemspec
 - lib/httpsql.rb
 - lib/httpsql/version.rb
+- test/api_test.rb
 - test/httpsql_test.rb
 - test/test_helper.rb
 - tmp/.gitkeep
@@ -205,5 +234,6 @@ specification_version: 4
 summary: Select model specified fields, create arbitrary queries, all using CGI query
   parameters
 test_files:
+- test/api_test.rb
 - test/httpsql_test.rb
 - test/test_helper.rb