chicrime 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 296f179810cd2694aa58f4f589058d28be6f60f0
-  data.tar.gz: 1fd9f41c5505fe9185933034be471af841e8d883
+  metadata.gz: f69c25653031948cc4523c954cb81c811d1d2027
+  data.tar.gz: 5c9f5345113f7f8fcc413c30b1d9f88a30da8ab6
 SHA512:
-  metadata.gz: f23afe47732fc570ed6aea12f3ab3a7620128012111da6b60f1cc4caf28d99be2c63f4d4f34e2008f3fb1a912b2de3d45c9133b696b8de2eedeb7a9b6bc5ea3e
-  data.tar.gz: 3588317ce41f7941395446a9951893620724fac84a604c048290668566932acebc755ac7b9226652427848802e7f5391fa6041b979012234e23845b1a6200390
+  metadata.gz: 15b2527ee7d4be8144035bdcffa36efae959b2630668cf56bc0f84f7cfeb71f34f8c159749ce6ec8d081b7b0793c6466343a1cd7e9582854805eabc5fe5c5896
+  data.tar.gz: 6d522998fbbb7d2f42b6d89c3ad23b2272a6572298f24c011ef8530358d3adf1b0f87ca4dc8d40789572cf0a837c48e7dd8217423b463371527dd2ef4c80eca7

data/README.md

@@ -45,6 +45,16 @@ chicrime.where("within_circle(location, 41.8719708, -87.6492965, 500)").order("d
 
 # Get results
 chicrime.where("year = '2014'", "community_area = '1'").order("date").results
+
+# New semi-working DSL
+chicrime.query do
+  where do
+    year equals 2014
+  end
+  order :id, :desc
+  limit 15
+  select :arrest, :date, :location
+end
 ```
 
 ## Resources
@@ -57,7 +67,10 @@ chicrime.where("year = '2014'", "community_area = '1'").order("date").results
 
 ## Development
 
-TODO: Implement group query & documentation
+TODO
+ - Implement group query
+ - Documentation
+ - Hash support for method queries
 
 ## Contributing
 

data/example.rb

@@ -0,0 +1,25 @@
+load 'lib/chicrime.rb'
+
+c = Chicrime::Dataset.new
+
+#results = c.client.get(c.dataset_id, {"$where" => "year = 2014 AND ward = 15",
+#                                      "$order" => "id DESC",
+#                                      "$select" => "ward, id, year",
+#                                      "$limit" => "6"})
+
+#results = c.where("year = 2014 AND ward = 15").order(:id, :desc).select(:ward, :id, :year).limit(6).results
+
+results = 
+  
+c.query do
+
+  where do
+    year equals 2014
+    ward equals 15
+  end
+
+  order :id, :desc
+  limit 1
+end
+
+puts results

data/lib/chicrime/version.rb

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

data/lib/chicrime.rb

@@ -3,40 +3,67 @@ require "soda/client"
 
 module Chicrime
   class Dataset
-    attr_accessor :client, :query
+    attr_accessor :client, :soql
     attr_reader :dataset_id
 
     def initialize token=''
       @client = SODA::Client.new({:domain => 'data.cityofchicago.org', :app_token => token})
       @dataset_id = 'ijzp-q8t2'
-      @query = {}
+      @soql = {}
     end
 
-    def where *args
-      query = args.count > 0 ? args * " AND " : ""
-      @query.store("$where", "#{query}")
+    def query &block
+      @soql = {}
+      instance_eval(&block)
+      results
+    end
+
+    def method_missing m, *args, &block 
+      if soql["$where"]
+        prev = soql["$where"] + " AND"
+      else
+        prev = ""
+      end
+
+      q = "#{prev} #{m} #{args[0]} #{args[1]}".strip
+
+      @soql.store("$where", "#{q}")
+    end
+
+    def equals data
+      "= #{data}"
+    end
+
+    def where *args, &block
+      if block_given?
+        instance_eval(&block)
+      else
+        q = args.count > 0 ? args * " AND " : ""
+        @soql.store("$where", "#{q}")
+      end
+
       self
     end
 
     def limit n
-      query = n
-      @query.store("$limit", "#{query}")
+      @soql.store("$limit", "#{n}")
       self
     end
     
     def select *args
-      query = args.count > 0 ? args * ', ' : ''
-      @query.store("$select", "#{query}")
+      q = args.count > 0 ? args * ', ' : ''
+      @soql.store("$select", "#{q}")
       self
     end
 
     def order column, order=:ASC
-      @query.store("$order", "#{column} #{order}")
+      @soql.store("$order", "#{column} #{order}")
       self
     end
 
     def results 
-      @client.get(@dataset_id, @query)
+      puts @soql
+      @client.get(@dataset_id, @soql)
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: chicrime
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Cody Roberts
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-08-08 00:00:00.000000000 Z
+date: 2015-12-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -211,6 +211,7 @@ files:
 - bin/console
 - bin/setup
 - chicrime.gemspec
+- example.rb
 - lib/chicrime.rb
 - lib/chicrime/version.rb
 homepage: http://www.codyjroberts.com