chawk 0.1.13 → 0.1.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 514c9371fbb400d5b4ac66ab41607f90ccf0fff0
-  data.tar.gz: f9f124f906aa007c2f30185ec4a8110f5084b955
+  metadata.gz: 07b68b72e9e6307500b9c964ccbf25761159cb01
+  data.tar.gz: 02061cf62e12d325848cc585a3ce674f4578355e
 SHA512:
-  metadata.gz: 5eb9123cdc07938a34d36dd6771602ee7968f3ae1570c59074ea1b85317014deee5643fb80000ae008c5aa0d56214632543b80ed4255001c0255587ad08472b9
-  data.tar.gz: eb256ec168c12ac0215b241be7738051eaca7debf9f1f532690ca8b3fda1099206033b953964f3b989395c3a3ce08024e02586b034c1c356775727f39cb5c9ed
+  metadata.gz: 983b276e02e0fe72ad6ff06b16416dfcf5a9d2d5f6dbba8434718b9c980e660e53cac8b5135a8cd5e3111c954969e8dd07510f00bd338e9f0fb152c2cc5ac466
+  data.tar.gz: 9658138baf8ac3f6c21c51512d19b22ff2519ef57fd55eb5b05f7bf2a1c1fe48ae60410425615d6fb20a504d8b51f773cc46caff365885c21a4ccd2891234f54

data/chawk.gemspec

@@ -18,6 +18,7 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
+  #spec.add_runtime_dependency "dm-postgres-adapter","1.2.0"
   spec.add_runtime_dependency "data_mapper", "1.2.0"
   
   spec.add_development_dependency "bundler", "~> 1.5"
@@ -26,5 +27,6 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency('rack-test', "0.6.2")
   spec.add_development_dependency('json', "1.8.1")
   spec.add_development_dependency('simplecov')
+  spec.add_development_dependency "dm-sqlite-adapter", "1.2.0"
 
 end

data/lib/addr.rb

@@ -47,7 +47,6 @@ module Chawk
 			Chawk::Paddr.new(self)
 		end
 
-
 		# Sets public read flag for this address 
 		# @param value [Boolean] true if public reading is allowed, false if it is not.
 		def public_read=(value)

data/lib/chawk.rb

@@ -32,6 +32,19 @@ module Chawk
 
 	end
 
+	# @param agent [Chawk::Agent] the agent whose permission will be used for this request 
+	# @param data [Hash] the bulk data to be inserted
+	# Insert data for multiple addresses at once.  Format should be a hash of valid data sets keyed by address 
+	# example: {'key1'=>[1,2,3,4,5],'key2'=>[6,7,8,9]}   
+	def self.bulk_add_points(agent, data)
+		data.keys.each do |key|
+			dset = data[key]
+			daddr = addr(agent,key)
+			daddr.points << dset
+		end
+	end
+
+
 	# Deletes all data in the database.  Very dangerous.  Backup often!
 	def self.clear_all_data!
 		if @@ready.nil?

data/lib/chawk/version.rb

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

data/lib/store.rb

@@ -33,25 +33,43 @@ module Chawk
 			coll.length
 		end
 
+		def insert_recognizer(item, dt, options={})
+			case 
+
+			when item.is_a?(stored_type)
+				_insert item,dt, options
+			when item.is_a?(Array)
+				if item.length == 2 && item[0].is_a?(stored_type) #value, timestamp
+					_insert item[0],item[1], options
+				else
+					raise ArgumentError, "Array Items must be in [value,timestamp] format. #{item.inspect}"
+				end
+			when item.is_a?(Hash)
+				if item['v'] && item['v'].is_a?(stored_type)
+					if item['t']
+						_insert item['v'],item['t'], options
+					else
+						_insert item['v'],dt, options
+					end
+				else
+					raise ArgumentError, "Hash must have 'v' key set to proper type.. #{item.inspect}"
+				end
+			else
+				raise ArgumentError, "Can't recognize format of data item. #{item.inspect}"
+			end
+		end
+
 		# @param args [Object, Array of Objects]
 		# @param options [Hash] You can also pass in :meta and :timestamp 
 		# Add an item or an array of items (one at a time) to the datastore.
 		def <<(args,options={})
-			dt = Time.now
+			options[:observed_at] ? dt = options[:observed_at] : dt = Time.now
 			if args.is_a?(Array)
 				args.each do |arg|
-					if arg.is_a?(stored_type)
-						self._insert(arg,dt,options)
-					else
-						raise ArgumentError
-					end
+					insert_recognizer(arg, dt, options)
 				end
 			else
-				if args.is_a?(stored_type)
-					_insert(args,dt,options)
-				else
-					raise ArgumentError
-				end
+				insert_recognizer(args, dt, options)
 			end
 			self.last
 		end

data/test/lib/paddr_test.rb

@@ -50,7 +50,12 @@ describe Chawk::Paddr do
  		@addr.points.length.must_equal(2)
  		@addr.points << 190
  		@addr.points << 10002
- 		@addr.points << [10,0,190,100]
+    @addr.points << [10,0,190,100]
+    dt = Time.now.to_f
+    @addr.points << [[10,dt],[0,dt],[190,dt],[100,dt]]
+    @addr.points << [{"v"=>10},{"v"=>0},{"v"=>190},{"v"=>100,"t"=>dt}]
+    @addr.points << [{"v"=>10,"t"=>dt},{"v"=>0,"t"=>dt},{"v"=>190,"t"=>dt},{"v"=>100,"t"=>dt}]
+    @addr.points << [{"t"=>dt,"v"=>10},{"v"=>0,"t"=>dt},{"t"=>dt,"v"=>190},{"v"=>100,"t"=>dt}]
  	end
 
  	it "does +" do
@@ -85,12 +90,25 @@ describe Chawk::Paddr do
  		lambda {@addr.points - nil}.must_raise(ArgumentError)
  	end
 
- 	it "only accepts integers" do
+ 	it "only accepts integers in proper formats" do
  		lambda {@addr.points << 10.0}.must_raise(ArgumentError)
  		lambda {@addr.points << nil}.must_raise(ArgumentError)
     lambda {@addr.points << [10.0,:x]}.must_raise(ArgumentError)
+    lambda {@addr.points << [[10,10,10],[10,10,20]]}.must_raise(ArgumentError)
+    dt = Time.now.to_f
+    lambda {@addr.points << [{"x"=>10,"t"=>dt},{"x"=>0,"t"=>dt}]}.must_raise(ArgumentError)
  	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}]})
+
+    Chawk.addr(@agent,"xxx").points.length.must_equal 6
+    Chawk.addr(@agent,"zzz").points.length.must_equal 2
+    Chawk.addr(@agent,"zzz").points.last.value.must_equal 0
+
+  end
+
  	it "has last()" do
   		@addr.points.must_respond_to(:last)
  	end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: chawk
 version: !ruby/object:Gem::Version
-  version: 0.1.13
+  version: 0.1.14
 platform: ruby
 authors:
 - Scott Russell
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-15 00:00:00.000000000 Z
+date: 2014-03-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: data_mapper
@@ -28,28 +28,28 @@ dependencies:
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.5'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.5'
 - !ruby/object:Gem::Dependency
   name: rake
   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
@@ -98,16 +98,30 @@ dependencies:
   name: simplecov
   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: dm-sqlite-adapter
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 1.2.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 1.2.0
 description: A storage engine for time-series data.  Eventually to include resampling,
   statistical and aggregate data management.
 email:
@@ -116,8 +130,8 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .travis.yml
+- ".gitignore"
+- ".travis.yml"
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -147,12 +161,12 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
@@ -167,4 +181,3 @@ test_files:
 - test/lib/quantizer_test.rb
 - test/lib/vaddr_test.rb
 - test/test_helper.rb
-has_rdoc: