chawk 0.1.15 → 0.1.16

data/test/schema.rb

@@ -0,0 +1,60 @@
+# This file is auto-generated from the current state of the database. Instead
+# of editing this file, please use the migrations feature of Active Record to
+# incrementally modify your database, and then regenerate this schema definition.
+#
+# Note that this schema.rb definition is the authoritative source for your
+# database schema. If you need to create the application database on another
+# system, you should be using db:schema:load, not running all the migrations
+# from scratch. The latter is a flawed and unsustainable approach (the more migrations
+# you'll amass, the slower it'll run and the greater likelihood for issues).
+#
+# It's strongly recommended that you check this file into your version control system.
+
+ActiveRecord::Schema.define(version: 0) do
+
+  create_table "chawk_agents", force: true do |t|
+    t.integer  "foreign_id"
+    t.string   "name",       limit: 200
+    t.datetime "created_at"
+    t.datetime "updated_at"
+  end
+
+  create_table "chawk_nodes", force: true do |t|
+    t.string  "key",          limit: 150
+    t.text    "decription"
+    t.boolean "public_read",              default: false
+    t.boolean "public_write",             default: false
+  end
+
+  create_table "chawk_points", force: true do |t|
+    t.float    "observed_at"
+    t.datetime "recorded_at"
+    t.text     "meta"
+    t.integer  "value"
+    t.integer  "node_id",     null: false
+  end
+
+  add_index "chawk_points", ["node_id"], name: "index_chawk_points_node"
+
+  create_table "chawk_relations", force: true do |t|
+    t.boolean "admin",    default: false
+    t.boolean "read",     default: false
+    t.boolean "write",    default: false
+    t.integer "agent_id",                 null: false
+    t.integer "node_id",                  null: false
+  end
+
+  add_index "chawk_relations", ["agent_id"], name: "index_chawk_relations_agent"
+  add_index "chawk_relations", ["node_id"], name: "index_chawk_relations_node"
+
+  create_table "chawk_values", force: true do |t|
+    t.float    "observed_at"
+    t.datetime "recorded_at"
+    t.text     "meta"
+    t.text     "value"
+    t.integer  "node_id",     null: false
+  end
+
+  add_index "chawk_values", ["node_id"], name: "index_chawk_values_node"
+
+end

data/test/test_helper.rb

@@ -17,17 +17,21 @@ ARGV.clear
 
 ENV["CHAWK_DEBUG"] ? debug_level=ENV["CHAWK_DEBUG"] : debug_level=:info
 
-if ENV["TEST_DATABASE_LOG"]
-	DataMapper::Logger.new(ENV["TEST_DATABASE_LOG"], debug_level)
-else
-	DataMapper::Logger.new($stdout, debug_level)
-end
+#if ENV["TEST_DATABASE_LOG"]
+#	ActiveRecord::Base.logger = Logger.new(STDOUT)
+#end
+
+require 'active_record'
 
-if ENV["TEST_DATABASE_URL"]
-	Chawk.setup ENV["TEST_DATABASE_URL"]
+if ENV["TEST_DATABASE_URLX"]
+	ActiveRecord::Base.establish_connection ENV["TEST_DATABASE_URL"]
 else
-	Chawk.setup 'sqlite::memory:'
-	DataMapper.auto_upgrade!
+	ActiveRecord::Base.establish_connection adapter: "sqlite3", database: ":memory:"
+	require "chawk/migration"
 end
 
+
+load File.dirname(__FILE__) + '/schema.rb'
+require File.dirname(__FILE__) + '/../lib/models.rb'
+
 Chawk.clear_all_data!

metadata

@@ -1,29 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: chawk
 version: !ruby/object:Gem::Version
-  version: 0.1.15
+  version: 0.1.16
 platform: ruby
 authors:
 - Scott Russell
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-18 00:00:00.000000000 Z
+date: 2014-03-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: data_mapper
+  name: activerecord
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.2.0
+        version: 4.0.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.2.0
+        version: 4.0.4
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -58,14 +58,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 5.3.0
+        version: 5.3.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 5.3.0
+        version: 5.3.1
 - !ruby/object:Gem::Dependency
   name: rack-test
   requirement: !ruby/object:Gem::Requirement
@@ -98,30 +98,44 @@ dependencies:
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.8.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.8.2
+- !ruby/object:Gem::Dependency
+  name: pg
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.17.1
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.17.1
 - !ruby/object:Gem::Dependency
-  name: dm-sqlite-adapter
+  name: sqlite3
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.2.0
+        version: 1.3.9
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.2.0
+        version: 1.3.9
 description: A storage engine for time-series data.  Eventually to include resampling,
   statistical and aggregate data management.
 email:
@@ -131,6 +145,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- ".pryrc"
 - ".travis.yml"
 - CHANGES
 - Gemfile
@@ -138,19 +153,18 @@ files:
 - README.md
 - Rakefile
 - chawk.gemspec
-- lib/addr.rb
 - lib/chawk.rb
 - lib/chawk/Jackdaw.svg
+- lib/chawk/migration.rb
 - lib/chawk/version.rb
 - lib/models.rb
-- lib/paddr.rb
 - lib/quantizer.rb
-- lib/store.rb
-- lib/vaddr.rb
 - test/lib/addr_test.rb
+- test/lib/failed_node_test.rb
 - test/lib/paddr_test.rb
 - test/lib/quantizer_test.rb
 - test/lib/vaddr_test.rb
+- test/schema.rb
 - test/test_helper.rb
 homepage: http://www.queuetue.com/Chawk
 licenses:
@@ -178,7 +192,9 @@ specification_version: 4
 summary: Time Series Storage Engine
 test_files:
 - test/lib/addr_test.rb
+- test/lib/failed_node_test.rb
 - test/lib/paddr_test.rb
 - test/lib/quantizer_test.rb
 - test/lib/vaddr_test.rb
+- test/schema.rb
 - test/test_helper.rb

data/lib/addr.rb

@@ -1,108 +0,0 @@
-require 'vaddr'
-require 'paddr'
-module Chawk
-	# Manages addressing of Nodes - all data operations in Chawk are done 
-	# through an instance of Chawk::Addr.
-	class Addr
-		attr_reader :path, :node, :agent
-
-		# @param agent [Chawk::Agent] the agent whose permission will be used for this request 
-		# @param path [String] the string address this addr can be found in the database.
-		# If a path does not exist, it will be created and the current agent will be set as an admin for it.
-		def initialize(agent,path)
-			@path = path
-			@agent = agent
-
-			unless path.is_a?(String)
-				raise 	entError, "Path must be a String."
-			end
-
-			unless path =~ /^[\w\:\$\!\@\*\[\]\~\(\)]+$/
-				raise ArgumentError, "Path can only contain [A-Za-z0-9_:$!@*[]~()] (#{path})"
-			end
-
-			@node = find_or_create_addr(path)
-
-			unless @node
-				raise ArgumentError,"No node returned."
-			end
-		end
-
-		# An alias for path
-		# @return [String] the string address this addr can be found in the database.
-		def address
-			@path
-		end
-
-
-		# Returns the Value Store at this address
-		# @return [Chawk::Vaddr]
-		def values()
-			Chawk::Vaddr.new(self)
-		end
-
-		# Returns the Point Store at this address
-		# @return [Chawk::Paddr]
-		def points()
-			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)
-			value = value ? true : false
-			#DataMapper.logger.debug "MAKING #{@node.address} PUBLIC (#{value})"
-			@node.update(public_read:value)
-		end
-
-		# Sets permissions flag for this address, for a specific agent.  The existing Chawk::Relationship will be destroyed and 
-		# a new one created as specified.  Write access is not yet checked.
-		# @param agent [Chawk::Agent] the agent to give permission.
-		# @param read [Boolean] true/false can the agent read this address.
-		# @param write [Boolean] true/false can the agent write this address. (Read acces is required to write.)
-		# @param admin [Boolean] does the agent have ownership/adnim rights for this address. (Read and write are granted if admin is as well.)
-		def set_permissions(agent,read=false,write=false,admin=false)
-			#DataMapper.logger.debug "REVOKING #{@node.address} / #{@agent.name} "
-			@node.relations.all(agent:agent).destroy()
-			if read || write || admin
-				vals = {agent:agent,read:(read ? true : false),write:(write ? true : false),admin:(admin ? true : false)}
-				#DataMapper.logger.debug "SET PERMISSIONS #{@node.address} / #{vals} "
-				@node.relations.create(vals)
-			end
-			nil
-		end
-
-private
-
-		def check_node_security(node)
-			if node.public_read
-				#DataMapper.logger.debug "NODE IS PUBLIC ACCESSABLE -- #{@agent.name} - #{@agent.id}"
-				return node
-			end
-			rel = node.relations.first(agent:@agent)
-			if (rel && (rel.read || rel.admin))
-				#DataMapper.logger.debug "NODE IS ACCESSABLE -- #{@agent.name} - #{@agent.id}"
-			return node
-			else
-				#DataMapper.logger.debug "NODE IS INACCESSABLE -- #{@agent.name} - #{@agent.id}"
-				raise SecurityError,"You do not have permission to access this node. #{@agent}"
-			end
-		end
-
-		def find_or_create_addr(addr)
-			#TODO also accept regex-tested string
-			raise(ArgumentError,"Path must be a string.") unless addr.is_a?(String)
-
-			node = Chawk::Models::Node.first(address:self.address)
-			if node
-				node = check_node_security(node)
-			else
-				#DataMapper.logger.debug "NODE CREATED -- #{@agent.name} -- #{@agent.id}"
-				node = Chawk::Models::Node.create(address:self.address) if node.nil?
-				node.relations.create(agent:@agent,node:node,admin:true,read:true,write:true)
-				return node
-			end
-		end
-
-	end
-end

data/lib/paddr.rb

@@ -1,59 +0,0 @@
-require 'store'
-
-module Chawk
-
-	# The Point Store - where time series integer data is stored, retrieved and aggregated through an instance of Chawk::Addr.
-	class Paddr
-
-		include Chawk::Store
-
-		# @param other [Integer] the integer to add to the value at this address.
-		# Increment the most recent point observed at this address.  The most recent observed is 
-		# not necessarily the most recent stored, as data can arrive out of order.
-
-		def +(other = 1)
-			raise ArgumentError unless other.is_a?(Numeric) && other.integer?
-			int = (self.last.value.to_i + other.to_i)
-			self << int
-		end  
-
-		# @param other [Integer] the integer to subtract to the value at this address.
-		# Decrement the most recent point observed at this address.  The most recent observed is 
-		# not necessarily the most recent stored, as data can arrive out of order.
-		def -(other = 1)
-			raise ArgumentError unless other.is_a?(Numeric) && other.integer?
-			self + (-other)
-		end  
-
-		  def length
-			coll.length
-		end
-
-		# @return [Integer] the largest value stored.
-		# Returns the largest value currently stored at this address.
-		def max
-			coll.max(:value)
-		end
-
-		# @return [Integer] the smallest value stored.
-		# Returns the smallest value currently stored at this address.
-		def min
-			coll.min(:value)
-		end
-private
-
-		def model
-			Chawk::Models::Point
-		end
-
-		def coll
-			@node.points
-		end
-
-		def stored_type
-			Integer
-		end
-
-	end
-
-end

data/lib/store.rb

@@ -1,124 +0,0 @@
-module Chawk
-	# The base store object, included by both Chawk::Vaddr and Chawk::Paddr
-	# To add a custom datastore, you would begin here.
-	module Store
-
-		# @param addr [Chawk::Addr] an address instance created from Chawk#addr.
-		def initialize(addr)
-			@addr = addr
-			@node = addr.node
-		end
-
-		# @param val [Object] value to store at this address.
-		# @param ts [Time::Time]
-		# @param options [Hash] Meta and Source information can be stored as well.
-		# This is an internal function to add a value to the datastore and specify the observed_at time.  It can be used 
-		# by external code, but do so carefully.
-		def _insert(val,ts,options={})
-			#DataMapper.logger.debug "PREINSERT #{val} -- #{ts.to_f}"
-
-			values = {value:val,observed_at:ts.to_f,agent:@addr.agent}
-			values[:meta] = options[:meta] if options[:meta]
-
-			coll.create(values)
-		end
-
-		# This will clear out all of the data stored at this address for this datastore.  Use with caution.
-		def clear_history!
-			model.all(node_id:@node.id).destroy
-		end
-
-		# The number of stores data points in this datastore at this address.
-		def length
-			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 append(args,options={})
-			options[:observed_at] ? dt = options[:observed_at] : dt = Time.now
-			if args.is_a?(Array)
-				args.each do |arg|
-					insert_recognizer(arg, dt, options)
-				end
-			else
-				insert_recognizer(args, dt, options)
-			end
-			self.last
-		end
-
-		def <<(args)
-			append(args)
-			#options[:observed_at] ? dt = options[:observed_at] : dt = Time.now
-			#if args.is_a?(Array)
-			#	args.each do |arg|
-			#		insert_recognizer(arg, dt, options)
-			#	end
-			#else
-			#	insert_recognizer(args, dt, options)
-			#end
-				#self.last
-		end
-
-		# @param count [Integer] returns an array with the last [0..count] items in the datastore.  If set to 1 or left empty, this returns a single item.
-		# Either the last item added to the datastore or an array of the last n items added to the datastore.
-		def last(count=1)
-			if count == 1
-				if coll.length > 0
-					coll.last
-					#PPoint.new(self, coll.last)
-				else
-					nil
-				end
-			else
-				vals = coll.all(limit:count,order:[:observed_at.asc, :id.asc])
-				#last_items = vals #.each.collect{|val|PPoint.new(self, val)}
-			end
-		end
-
-		# Returns items whose observed_at times fit within from a range.
-		# @param dt_from [Time::Time] The start time.
-		# @param dt_to [Time::Time] The end time.
-		# @return [Array of Objects] 
-		def range(dt_from, dt_to,options={})
-			vals = coll.all(:observed_at.gte => dt_from, :observed_at.lte =>dt_to, limit:1000,order:[:observed_at.asc, :id.asc])
-			return vals
-		end
-
-		# Returns items whose observed_at times fit within from a range ending now.
-		# @param dt_from [Time::Time] The start time.
-		# @return [Array of Objects] 
-		def since(dt_from)
-			self.range(dt_from,Time.now)
-		end
-
-	end
-end
-