chawk 0.1.16 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8e4af3f3f47d72453ac226d2f5645f8288c38843
-  data.tar.gz: 4c5cdc1405311d4b03e67540f0fd55c1eb4997af
+  metadata.gz: 594fd4f014cdc8821cd8feef0648fb62c55ad867
+  data.tar.gz: 3fb8f4e6e0d0c5721abeb9f754da547f0a7b53be
 SHA512:
-  metadata.gz: e276cefee3bc31f2bd0c3e1fd668a67336935abde8f17624f901d672e85fc03f22b61777bc9f4d166d1bcf6fcaeb451fe54702de8b166e0ffc722e78991cb696
-  data.tar.gz: c373b9799df4768f20851298ce7a083cfe16174a24b73e29769b48920e034273ff91a5df75509ca6f941c20cd232be6bb079e1eb9652ed214646f6fea490499f
+  metadata.gz: d4861cad5119b155663c60c3c70acaa0063fb022a4153b74d547442ddf450fcee2d2f3ae0b9189bfeaa51cd7b917065d54282cdc51c8a2414ffcb97dbaebcbd4
+  data.tar.gz: acb26f7f49583c10175e4ec31fe95bbfa36f9f2234688fc49c2e460f8bd0ec559ae5aff60a53bdf20d2c174ce5c77d73cd5945124f5de2c7514d638fef64bfbe

data/CHANGES

@@ -3,3 +3,7 @@
 Added "append" method and redirected << into it (Apparently, << is magic and won't take 2 parameters)
 -- 0.1.16 --
 Switched to ActiveRecord, removed DataMapper
+-- 0.1.17 --
+Points can now be passed as strings representing integers
+-- 0.1.18 --
+metadata is stored as json (must be passed as a hash)

data/lib/chawk/migration.rb

@@ -1,31 +1,5 @@
 ## ~~~- Created via -~~~
 
-# ActiveRecord::Base.establish_connection ENV["TEST_DATABASE_URL"]
-# File.open(schema_file, "w") do |file|
-# 	ActiveRecord::SchemaDumper.dump(ActiveRecord::Base.connection, file)
-# end
-
-# create_table "chawk_g_users", force: true do |t|
-#   t.string  "google_id",    limit: 120
-#   t.string  "google_email", limit: 120
-#   t.string  "email",        limit: 120
-#   t.string  "handle",       limit: 30
-#   t.string  "name",         limit: 40
-#   t.string  "family_name",  limit: 20
-#   t.text    "image"
-#   t.text    "secret"
-#   t.string  "api_key",      limit: 200
-#   t.integer "reset_token"
-#   t.integer "access_token"
-#   t.integer "agent_id"
-# end
-# add_index "chawk_g_users", ["agent_id"], name: "index_chawk_g_users_agent", using: :btree
-
-#require 'active_record'
-#ActiveRecord::Base.logger = Logger.new(STDOUT)
-#ActiveRecord::Base.establish_connection ENV["TEST_DATABASE_URL"]
-
-ActiveRecord::Migration.verbose = false
 class CreateChawkBase < ActiveRecord::Migration
 	def up
 		create_table "chawk_agents", force: true do |t|
@@ -83,10 +57,3 @@ class CreateChawkBase < ActiveRecord::Migration
 
 end
 
-#CreateChawkBase.migrate :down
-CreateChawkBase.migrate :up
-
-File.open('./test/schema.rb', "w") do |file|
-	ActiveRecord::SchemaDumper.dump(ActiveRecord::Base.connection, file)
-end
-

data/lib/chawk/version.rb

@@ -1,4 +1,4 @@
 module Chawk
 	# The current version of Chawk
-	VERSION = "0.1.16"
+	VERSION = "0.2.0"
 end

data/lib/models.rb

@@ -34,7 +34,13 @@ module Chawk
 
 			def _insert_point(val,ts,options={})
 				values = {value:val,observed_at:ts.to_f}
-				values[:meta] = options[:meta] if options[:meta]
+				if options[:meta]
+					if options[:meta].is_a?(Hash)
+						values[:meta] = options[:meta].to_json
+					else
+						raise ArgumentError, "Meta must be a JSON-representable Hash. #{options[:meta].inspect}"
+					end
+				end
 				self.points.create(values)
 			end
 
@@ -58,6 +64,14 @@ module Chawk
 				end
 			end
 
+			def _insert_point_string(item,ts,options)
+				if item.length > 0 && item =~ /\A[-+]?[0-9]+/
+					_insert_point item.to_i,ts, options
+				else
+					raise ArgumentError, "String Items must represent Integer. #{item.inspect}"
+				end
+			end
+
 			def point_recognizer(item, dt, options={})
 				case 
 				when item.is_a?(Integer)
@@ -66,6 +80,8 @@ module Chawk
 					_insert_point_array(item, options)
 				when item.is_a?(Hash)
 					_insert_point_hash(item,dt,options)
+				when item.is_a?(String)
+					_insert_point_string(item,dt,options)
 				else
 					raise ArgumentError, "Can't recognize format of data item. #{item.inspect}"
 				end

data/test/lib/paddr_test.rb

@@ -114,6 +114,18 @@ describe Chawk do
     lambda {@addr.add_points [{"x"=>10,"t"=>dt},{"x"=>0,"t"=>dt}]}.must_raise(ArgumentError)
  	end
 
+  it "accepts string integers in proper formats" do
+    lambda {@addr.add_points "X"}.must_raise(ArgumentError)
+    @addr.add_points "10"
+    @addr.points.length.must_equal(1)
+    @addr.add_points "0"
+    @addr.points.length.must_equal(2)
+    @addr.add_points "190"
+    @addr.add_points "10002"
+    @addr.add_points ["10","0","190","100"]
+    @addr.points.length.must_equal(8)
+  end
+
   it "does bulk add points" do
     dt = Time.now.to_f
     Chawk.bulk_add_points(@agent, {"xxx"=>[1,2,3,4,5,6], "yyy"=>[[10,dt],[10,dt]], "zzz"=>[{"t"=>dt,"v"=>10},{"v"=>0,"t"=>dt}]})
@@ -140,9 +152,17 @@ describe Chawk do
  	end
 
   it "stores meta information" do
-    @addr.add_points(10,{:meta=>"Some meta_information"})
-    @addr.points.last.value.must_equal(10)
-    @addr.points.last.meta.must_equal("Some meta_information")
+
+    metadata = {"info"=>"this is a test"}
+    @addr.add_points([1,2,3,4],{:meta=>metadata})
+    @addr.points.last.value.must_equal(4)
+    JSON.parse(@addr.points.last.meta).must_equal(metadata)
+
+    metadata = {"number"=>123}
+    @addr.add_points([1,2,3,4],{:meta=>metadata})
+    @addr.points.last.value.must_equal(4)
+    JSON.parse(@addr.points.last.meta).must_equal(metadata)
+
   end
 
 

data/test/test_helper.rb

@@ -27,7 +27,12 @@ if ENV["TEST_DATABASE_URLX"]
 	ActiveRecord::Base.establish_connection ENV["TEST_DATABASE_URL"]
 else
 	ActiveRecord::Base.establish_connection adapter: "sqlite3", database: ":memory:"
+	ActiveRecord::Migration.verbose = false
 	require "chawk/migration"
+	CreateChawkBase.migrate :up
+	File.open('./test/schema.rb', "w") do |file|
+		ActiveRecord::SchemaDumper.dump(ActiveRecord::Base.connection, file)
+	end
 end
 
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: chawk
 version: !ruby/object:Gem::Version
-  version: 0.1.16
+  version: 0.2.0
 platform: ruby
 authors:
 - Scott Russell
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-21 00:00:00.000000000 Z
+date: 2014-03-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord