data_store 0.1.9 → 0.2.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 0bc549a10d7a06c7a3d644b3558c1d9389621f8d
+  data.tar.gz: a6450c7d17d1e9350ed4f998fb17f04d67a40e9c
+SHA512:
+  metadata.gz: 80a97d74d1899e36100cbaead1916b154c8cc08a27650d6459d5821bf3720122d6d22c43705937de51953791af3b81192997bd98bb04f32e834a27fac9818dd6
+  data.tar.gz: bba43210532999187df99db2e6945f8d4580556c6789b992cd56e8391af43b2c8001258b6401c45aa4f9578c36eec2f8b91c68a831eaf425abd04991c631622c

data/.ruby-gemset

@@ -0,0 +1 @@
+data_store

data/.ruby-version

@@ -0,0 +1 @@
+2.0.0-p247

data/.travis.yml

@@ -1,7 +1,7 @@
 language: ruby
 rvm:
-  - 1.9.3
-  - rbx-19mode
+  - 2.0.0
+  - rbx-2.1.1
   - jruby-19mode
 
 matrix:

data/Gemfile

@@ -17,7 +17,7 @@ end
 group :test, :development do
   gem 'rake'
   gem 'shoulda'
-  gem 'mocha'
+  gem 'mocha', require: 'mocha/setup'
   gem 'guard'
   gem 'guard-test'
   gem 'rb-fsevent'

data/README.md

@@ -43,7 +43,7 @@ For JRuby on of the following:
     DataStore.configure do |config|
       config.prefix              = 'ds_'
       config.database            = :mysql
-      config.compression_schema  = [6,5,3]
+      config.compression_schema  = '[6,5,3]'
       config.data_type           = :double
       config.frequency           = 10
       config.maximum_datapoints  = 800

data/data_store.gemspec

@@ -16,5 +16,5 @@ Gem::Specification.new do |gem|
   gem.require_paths = ['lib']
   gem.version       = DataStore::VERSION
 
-  gem.add_dependency('sequel')
+  gem.add_dependency('sequel', '4.4.0')
 end

data/lib/data_store/base.rb

@@ -22,11 +22,16 @@ module DataStore
     end
 
     # Convert serialized compression schema as a string back into the array object itself.
-    # For example: "[5,4,3]" => [5,4,3]
-    def compression_schema
+    # For example: "(5,4,3)" => [5,4,3]
+     def compression_schema
       value = self.values[:compression_schema]
-      value.gsub(/\[|\]/,'').split(',').map(&:to_i) unless value.nil?
-    end
+      if value.nil?
+        value = []
+      else
+        value = value.gsub(/\[|\]|\(|\)/,'').split(',').map(&:to_i) unless value.is_a?(Array)
+      end
+      value
+     end
 
     def table_names
       names  = [table_name]

data/lib/data_store/configuration.rb

@@ -9,8 +9,10 @@ module DataStore
     # The database used for storing the data.
     attr_accessor :database
 
-    # The schema is the way avarages of the datapoints is calculated/
-    #  Default: [6,5,3,4,4,3]
+    # The compression schema defines the compression of the data, i.e how the averages of the datapoints are calculated.
+    # Default: '[6,5,3,4,4,3]'
+    # With the default settings: from every 6 datapoints an average value is calculated. From those calculated average values
+    # from every five values a new average value is created (The compression is now 6 * 5 = 30).
     attr_accessor :compression_schema
 
     # The frequency tells how often data entry is done.
@@ -50,7 +52,7 @@ module DataStore
     def initialize
       @prefix                      = 'ds_'
       @database                    = :postgres
-      @compression_schema          = [6,5,3,4,4,3]
+      @compression_schema          = '[6,5,3,4,4,3]'
       @frequency                   = 10
       @maximum_datapoints          = 800
       @data_type                   = :double

data/lib/data_store/version.rb

@@ -1,3 +1,3 @@
 module DataStore
-  VERSION = '0.1.9'
+  VERSION = '0.2.0'
 end

data/test/average_calculator_test.rb

@@ -15,7 +15,7 @@ class AverageCalculatorTest < Test::Unit::TestCase
                                        name:        'Electra',
                                        frequency:    10,
                                        description: 'Actual usage of electra in the home',
-                                       compression_schema: [2,2,2])
+                                       compression_schema: '[2,2,2]')
 
       @table = DataStore::Table.new(1)
       @calculator = DataStore::AverageCalculator.new(@table)
@@ -141,7 +141,7 @@ class AverageCalculatorTest < Test::Unit::TestCase
                                        name:        'Electra',
                                        frequency:    10,
                                        description: 'Actual usage of gas in the home',
-                                       compression_schema: [2])
+                                       compression_schema: '[2]')
 
       @table = DataStore::Table.new(1)
       @calculator = DataStore::AverageCalculator.new(@table)

data/test/configuration_test.rb

@@ -7,7 +7,7 @@ class ConfigurationTest < Test::Unit::TestCase
     should "provide default values" do
       assert_config_default :prefix,               'ds_'
       assert_config_default :database,             :postgres
-      assert_config_default :compression_schema,   [6,5,3,4,4,3]
+      assert_config_default :compression_schema,   '[6,5,3,4,4,3]'
       assert_config_default :frequency,            10
       assert_config_default :frequency_tolerance,  0.05
       assert_config_default :maximum_datapoints,   800

data/test/data_store_test.rb

@@ -27,7 +27,7 @@ class DataStoreTest < Test::Unit::TestCase
                                          type:               'gauge', 
                                          name:               'Electra',
                                          description:        'Actual usage of electra in the home',
-                                         compression_schema: [5,4,3])
+                                         compression_schema: '[5,4,3]')
       end
 
       should 'be valid' do
@@ -56,7 +56,7 @@ class DataStoreTest < Test::Unit::TestCase
                                         frequency:          5,
                                         maximum_datapoints: 10,
                                         description:        'Gas usage',
-                                        compression_schema: [2,4])
+                                        compression_schema: '[2,4]')
         assert_equal [50, 100, 400], record.time_borders
       end
 

data/test/integration_test.rb

@@ -11,7 +11,7 @@ class IntegrationTest < Test::Unit::TestCase
                                        name:        'Electra',
                                        frequency:    10,
                                        description: 'Actual usage of gas in the home',
-                                       compression_schema: [2,2])
+                                       compression_schema: '[2,2]')
 
       @table = DataStore::Table.new(1)
       @calculator = DataStore::AverageCalculator.new(@table)
@@ -47,7 +47,7 @@ class IntegrationTest < Test::Unit::TestCase
                                        type:        'gauge', 
                                        name:        'Electra',
                                        description: 'Actual usage of electra in the home',
-                                       compression_schema: [2,3])
+                                       compression_schema: '[2,3]')
       @table = DataStore::Table.new(1)
     end
 

data/test/table_test.rb

@@ -10,7 +10,7 @@ class TableTest < Test::Unit::TestCase
                                        type:        'gauge', 
                                        name:        'Electra',
                                        description: 'Actual usage of electra in the home',
-                                       compression_schema: [5,6,10])
+                                       compression_schema: '[5,6,10]')
       @table = DataStore::Table.new(1)
     end
 
@@ -117,7 +117,7 @@ class TableTest < Test::Unit::TestCase
                                          type:        'gauge', 
                                          name:        'Electra',
                                          description: 'Actual usage of electra in the home',
-                                         compression_schema: [5,6,10])
+                                         compression_schema: '[5,6,10]')
 
         @table = DataStore::Table.new(1, 1)
         @table.stubs(:calculate_average_values)
@@ -142,7 +142,7 @@ class TableTest < Test::Unit::TestCase
                                          type:               'counter', 
                                          name:               'Gas',
                                          description:        'Actual usage of natural gas',
-                                         compression_schema: [])
+                                         compression_schema: '[]')
         @table = DataStore::Table.new(2)
       end
 

data/test/test_helper.rb

@@ -8,7 +8,7 @@ rescue Bundler::BundlerError => e
   exit e.status_code
 end
 require 'test/unit'
-require 'mocha'
+require 'mocha/setup'
 require 'shoulda'
 
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))

metadata

@@ -1,32 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: data_store
 version: !ruby/object:Gem::Version
-  version: 0.1.9
-  prerelease: 
+  version: 0.2.0
 platform: ruby
 authors:
 - Frank Oxener
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-16 00:00:00.000000000 Z
+date: 2013-11-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sequel
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 4.4.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 4.4.0
 description: DataStore is designed to store real time data but still manage the growth
   of your dataset and still keeping historical data
 email:
@@ -36,6 +33,8 @@ extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
+- .ruby-gemset
+- .ruby-version
 - .rvmrc
 - .travis.yml
 - CHANGELOG.md
@@ -67,33 +66,26 @@ files:
 homepage: https://github.com/dovadi/data_store
 licenses:
 - MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -2498536008263531709
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -2498536008263531709
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.25
+rubygems_version: 2.1.9
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: DataStore for storing real time data
 test_files:
 - test/average_calculator_test.rb