nutella_lib 0.4.2 → 0.4.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 25072166ecae9ae559f4b840e182cd7bd98d0214
-  data.tar.gz: 7a92ee424cc7dc05d652367a130c8e9503e3ef50
+  metadata.gz: 89d3a0b4c11ff480c5ddc4cd1194b3d45282554c
+  data.tar.gz: 945a65a8305195c62565fa7a0271bfbed976372f
 SHA512:
-  metadata.gz: 67fd2436b2c681b701507fb3bea9b6117f86469f02e72555ba02888f25f842541fa691c09ef484774c6d5688f08aee90f264ba94781fd25da3949ce314a8defc
-  data.tar.gz: 8fe08e8d12a9ad440c169a5795d6b1cb63de0fe81a313b91354bb390ba4fedc8f3e357cff776b5d0b796ba302e72a0a1a0974fb8a6e68adce4225a940c22e2e8
+  metadata.gz: e420ed840733d07fd49022a92804dd3abd452a4ed5c5d41652e81f8efce7fc02557e406eba493ae22a9a37fb125aebeaf3d9ac133933c16f97741b2d085ce3fa
+  data.tar.gz: 13d69e009f11b515b67ece3051944d7fcf230084dc9c6759b55245eddf6007c17a4b69f9f5407b0035f928712f21c71e1af0cdb3b9463f45823cb67666e2a6ae

data/Gemfile

@@ -2,6 +2,7 @@ source 'http://rubygems.org'
 
 gem 'mqtt', '~> 0.3', '>= 0.3'
 gem 'ansi', '~> 1.5', '>= 1.4'
+gem 'mongo','~> 2.0.0.rc', '>= 2.0.0.rc'
 
 group :development do
   gem 'shoulda', '~> 3', '>= 3'

data/VERSION

@@ -1 +1 @@
-0.4.2
+0.4.3

data/lib/nutella_lib/app_core.rb

@@ -12,17 +12,21 @@ module Nutella
       Nutella.resource_id = nil
       Nutella.mqtt = SimpleMQTTClient.new broker_hostname
       # Fetch the `run_id`s list for this application and subscribe to its updates
-      @app_runs_list = net.sync_request('app_runs_list')
+      net.async_request('app_runs_list', lambda { |res| Nutella.app.app_runs_list = res })
       self.net.subscribe('app_runs_list', lambda {|message, _| Nutella.app.app_runs_list = message })
     end
 
     # Setter/getter for runs_list
     def self.app_runs_list=(val) @app_runs_list=val; end
-    def self.app_runs_list; @app_runs_list end
+    def self.app_runs_list
+      raise 'Nutella has not been initialized: you need to call the proper init method before you can start using nutella' if @app_runs_list.nil?
+      @app_runs_list
+    end
 
     # Accessors for sub-modules
     def self.net; Nutella::App::Net; end
     def self.log; Nutella::App::Log; end
+    def self.persist; Nutella::App::Persist; end
 
 
     # Parse command line arguments for app level components

data/lib/nutella_lib/app_persist.rb

@@ -0,0 +1,53 @@
+require 'util/mongo_persisted_collection'
+require 'util/json_file_persisted_collection'
+require 'util/mongo_persisted_hash'
+require 'util/json_file_persisted_hash'
+require 'fileutils'
+
+
+module Nutella
+
+  module App
+
+    # Implements basic app-dependent persistence for app-level components
+    module Persist
+
+      # This method returns a MongoDB-backed store (i.e. persistence)
+      # for a collection (i.e. an Array)
+      # @param [String] name the name of the store
+      # @return [MongoPersistedCollection] a MongoDB-backed collection store
+      def self.get_mongo_collection_store( name )
+        MongoPersistedCollection.new Nutella.mongo_host, Nutella.app_id, name
+      end
+
+      # This method returns a MongoDB-backed store (i.e. persistence)
+      # for a single object (i.e. an Hash)
+      # @param [String] name the name of the store
+      # @return [MongoPersistedHash] a MongoDB-backed Hash store
+      def self.get_mongo_object_store( name )
+        MongoPersistedHash.new Nutella.mongo_host, Nutella.app_id, 'app_persisted_hashes', name
+      end
+
+      # This method returns a JSON-file-backed store (i.e. persistence)
+      # for a collection (i.e. an Array)
+      # @param [String] name the name of the store
+      # @return [JSONFilePersistedCollection] a JSON-file-backed collection store
+      def self.get_json_collection_store( name )
+        file_path = "data/#{name}.json"
+        FileUtils.mkdir_p 'data/'
+        JSONFilePersistedCollection.new file_path
+      end
+
+      # This method returns a JSON-file-backed store (i.e. persistence)
+      # for a single object (i.e. an Hash)
+      # @param [String] name the name of the store
+      # @return [JSONFilePersistedHash] a JSON-file-backed Hash store
+      def self.get_json_object_store( name )
+        file_path = "data/#{name}.json"
+        FileUtils.mkdir_p 'data/'
+        JSONFilePersistedHash.new file_path
+      end
+    end
+  end
+
+end

data/lib/nutella_lib/core.rb

@@ -11,6 +11,7 @@ module Nutella
     @run_id = run_id
     @component_id = component_id
     @resource_id = nil
+    @mongo_host = broker_hostname
     @mqtt = SimpleMQTTClient.new broker_hostname
   end
 
@@ -23,6 +24,10 @@ module Nutella
     raise 'Nutella has not been initialized: you need to call the proper init method before you can start using nutella' if @component_id.nil?
     @component_id
   end
+  def self.mongo_host
+    raise 'Nutella has not been initialized: you need to call the proper init method before you can start using nutella' if @mongo_host.nil?
+    @mongo_host
+  end
   def self.mqtt;
     raise 'Nutella has not been initialized: you need to call the proper init method before you can start using nutella' if @mqtt.nil?
     @mqtt

data/lib/nutella_lib/persist.rb

@@ -1,85 +1,56 @@
-require 'json'
-require 'pstore'
+require 'util/mongo_persisted_collection'
+require 'util/json_file_persisted_collection'
+require 'util/mongo_persisted_hash'
+require 'util/json_file_persisted_hash'
 require 'fileutils'
-require 'thread'
+
 
 module Nutella
 
-  # Implements basic run-dependent persistence for nutella bots.
+  # Implements basic run-dependent persistence for run-level components
   module Persist
 
-    # This module exposes a single method to retrieve a JSONStore
-    def Persist.getJsonStore(file_name)
-      dir = file_name[0..file_name.rindex('/')]
-      file = file_name[file_name.rindex('/')..file_name.length-1]
-      new_dir = dir + Nutella.run_id
-      FileUtils.mkdir_p new_dir
-      JSONStore.new(new_dir + file)
-    end
-
-  end
-
-# JSONStore provides the same functionality as PStore, except it uses JSON
-# to dump objects instead of Marshal.
-# Example use:
-#   store = nutella.persist.getJsonStore("json_store/json_test.json")
-#   # Write
-#   store.transaction { store["key"]="value" }
-#   # Read
-#   value = store.transaction { store["key"] }
-#   puts value # prints "value"
-#   # Dump the whole store
-#   hash = store.transaction { store.to_h }
-#   p hash # prints {"key" => "value"}
-
-  class JSONStore < PStore
-
-    def initialize(path)
-      super
-      @semaphore = Mutex.new
-    end
-
-    def dump(table)
-      table.to_json
-    end
-
-    def load(content)
-      JSON.parse(content)
+    # This method returns a MongoDB-backed store (i.e. persistence)
+    # for a collection (i.e. an Array)
+    # @param [String] name the name of the store
+    # @return [MongoPersistedCollection] a MongoDB-backed collection store
+    def self.get_mongo_collection_store( name )
+      collection = "#{Nutella.run_id}/#{name}"
+      MongoPersistedCollection.new Nutella.mongo_host, Nutella.app_id, collection
     end
 
-    def transaction(read_only=false, &block)
-      @semaphore.synchronize {
-        # access shared resource
-        super
-      }
+    # This method returns a MongoDB-backed store (i.e. persistence)
+    # for a single object (i.e. an Hash)
+    # @param [String] name the name of the store
+    # @return [MongoPersistedHash] a MongoDB-backed Hash store
+    def self.get_mongo_object_store( name )
+      doc_id = "#{Nutella.run_id}/#{name}"
+      MongoPersistedHash.new Nutella.mongo_host, Nutella.app_id, 'run_persisted_hashes', doc_id
     end
 
-    # Dumps the whole store to hash
-    # example:
-    # store = JSONStore.new("my_file.json")
-    # hash = store.transaction { store.to_h }
-    def to_h
-      @table
+    # This method returns a JSON-file-backed store (i.e. persistence)
+    # for a collection (i.e. an Array)
+    # @param [String] name the name of the store
+    # @return [JSONFilePersistedCollection] a JSON-file-backed collection store
+    def self.get_json_collection_store( name )
+      dir_path = "data/#{Nutella.run_id}"
+      file_path = "data/#{Nutella.run_id}/#{name}.json"
+      FileUtils.mkdir_p dir_path
+      JSONFilePersistedCollection.new file_path
     end
 
-    def merge!( hash )
-      @table.merge!(hash)
+    # This method returns a JSON-file-backed store (i.e. persistence)
+    # for a single object (i.e. an Hash)
+    # @param [String] name the name of the store
+    # @return [JSONFilePersistedHash] a JSON-file-backed Hash store
+    def self.get_json_object_store( name )
+      dir_path = "data/#{Nutella.run_id}"
+      file_path = "data/#{Nutella.run_id}/#{name}.json"
+      FileUtils.mkdir_p dir_path
+      JSONFilePersistedHash.new file_path
     end
 
 
-    def marshal_dump_supports_canonical_option?
-      false
-    end
-
-    EMPTY_MARSHAL_DATA = {}.to_json
-    EMPTY_MARSHAL_CHECKSUM = Digest::MD5.digest(EMPTY_MARSHAL_DATA)
-    def empty_marshal_data
-      EMPTY_MARSHAL_DATA
-    end
-    def empty_marshal_checksum
-      EMPTY_MARSHAL_CHECKSUM
-    end
   end
 
-
 end

data/lib/nutella_lib.rb

@@ -11,6 +11,7 @@ require 'nutella_lib/persist'
 require 'nutella_lib/app_core'
 require 'nutella_lib/app_net'
 require 'nutella_lib/app_log'
+require 'nutella_lib/app_persist'
 
 # NO_EXT gets defined when you require "nutella_lib/noext", which
 # signals that you don't want any extensions.

data/lib/util/json_file_persisted_collection.rb

@@ -0,0 +1,71 @@
+require 'json'
+require 'util/json_store'
+
+# Collection of items that are automatically persisted to a JSON file
+class JSONFilePersistedCollection
+
+  # Creates a new JSONFilePersistedCollection
+  #
+  # @param [String] file the JSON file used to persist this collection
+  def initialize( file )
+    @store = JSONStore.new(file, true)
+  end
+
+
+  # Pushes (appends) the given hash on to the end of this persisted collection
+  #
+  # @param [Hash] item the object we want to append
+  # @return [JSONFilePersistedCollection] the persisted collection itself, so several appends may be chained together
+  def push( item )
+    @store.transaction do
+      @store['collection'] = Array.new if @store['collection'].nil?
+      @store['collection'].push(item)
+    end
+    self
+  end
+
+
+  # Deletes the first element from this persisted collection that is equal to item
+  #
+  # @param [Hash] item the object we want to delete
+  # @return [Hash] the object we just deleted
+  def delete( item )
+    r = nil
+    @store.transaction do
+      if @store['collection'].nil?
+        r = {}
+        @store.abort
+      end
+      r = @store['collection'].delete_at(@store['collection'].index(item) || @store['collection'].length)
+      r = {} if r.nil?
+    end
+    r
+  end
+
+
+  # Replaces the first element from this persisted array that matches item, with replacement
+  #
+  # @param [Hash] replacement for the current element
+  # @return [Hahs] the item that was replaced, {} if the element wasn't in the collection
+  def replace( item, replacement )
+    r = delete item
+    push replacement
+    r
+  end
+
+
+  # Returns an array representation of this collection
+  #
+  # @return [Array<Hash>] array representation of this persisted collection
+  def to_a
+    @store.transaction { @store['collection'].nil? ? {} : @store['collection'] }
+  end
+
+  # Returns the length of the collection
+  #
+  # @return [Fixnum] the length of the collection
+  def length
+    @store.transaction { @store['collection'].nil? ? 0 : @store['collection'].length }
+  end
+
+end

data/lib/util/json_file_persisted_hash.rb

@@ -0,0 +1,80 @@
+require 'util/json_store'
+
+# An hash that is automatically persisted to a JSON file.
+# This class behaves *similarly* to a regular Hash but it persists every operation
+# to a specified JSON file.
+# Not all Hash operations are supported and we added some of our own.
+class JSONFilePersistedHash
+
+  def initialize( file )
+    @store = JSONStore.new(file, true)
+  end
+
+
+  # Methods borrowed from Ruby's Hash class
+
+  def []( key )
+    @store.transaction { @store[key] }
+  end
+
+  def []=( key, val )
+    @store.transaction { @store[key]=val }
+  end
+
+  def delete( key )
+    @store.transaction { @store.delete key }
+  end
+
+  def empty?
+    @store.transaction { @store.to_h.empty? }
+  end
+
+  def has_key?( key )
+    @store.transaction { @store.to_h.has_key? key }
+  end
+
+  def include?( key )
+    has_key? key
+  end
+
+  def to_s
+    @store.transaction { @store.to_h.to_s }
+  end
+
+  def to_h
+    @store.transaction { @store.to_h }
+  end
+
+  def keys
+    @store.transaction { @store.to_h.keys }
+  end
+
+  def length
+    @store.transaction { @store.to_h.length }
+  end
+
+
+  # PersistedHash-only public methods
+
+  # Adds a <key, value> pair to the PersistedHash _only if_
+  # there is currently no value associated with the specified key.
+  # @return [Boolean] false if the key already exists, true if the
+  # <key, value> pair was added successfully
+  def add_key_value?(key, val)
+    @store.transaction do
+      return false if @store.to_h.key? key
+      @store[key]=val
+    end
+    true
+  end
+
+  # Removes a <key, value> pair from the PersistedHash _only if_
+  # there is currently a value associated with the specified key.
+  # @return [Boolean] false if there is no value associated with
+  # the specified key, true otherwise
+  def delete_key_value?( key )
+    @store.transaction { return false if @store.delete(key).nil? }
+    true
+  end
+
+end

data/lib/util/json_store.rb

@@ -0,0 +1,50 @@
+require 'json'
+require 'pstore'
+require 'fileutils'
+
+# JSONStore provides the same functionality as PStore, except it uses JSON
+# to dump objects instead of Marshal.
+# Example use:
+#   store = JSONStore.new("json_store/json_test.json")
+#   # Write
+#   store.transaction { store["key"]="value" }
+#   # Read
+#   value = store.transaction { store["key"] }
+#   puts value # prints "value"
+#   # Dump the whole store
+#   hash = store.transaction { store.to_h }
+#   p hash # prints {"key" => "value"}
+
+class JSONStore < PStore
+
+  def dump(table)
+    table.to_json
+  end
+
+  def load(content)
+    JSON.parse(content)
+  end
+
+
+  # Dumps the whole store to hash
+  # example:
+  # store = JSONStore.new("my_file.json")
+  # hash = store.transaction { store.to_h }
+  def to_h
+    @table
+  end
+
+
+  def marshal_dump_supports_canonical_option?
+    false
+  end
+
+  EMPTY_MARSHAL_DATA = {}.to_json
+  EMPTY_MARSHAL_CHECKSUM = Digest::MD5.digest(EMPTY_MARSHAL_DATA)
+  def empty_marshal_data
+    EMPTY_MARSHAL_DATA
+  end
+  def empty_marshal_checksum
+    EMPTY_MARSHAL_CHECKSUM
+  end
+end

data/lib/util/mongo_persisted_collection.rb

@@ -0,0 +1,76 @@
+require 'mongo'
+
+# Collection of items that are automatically persisted to a MongoDB collection
+class MongoPersistedCollection
+
+
+  # Creates a new MongoPersistedCollection
+  #
+  # @param [String] hostname of the MongoDB server
+  # @param [String] db the database where we want to persist the array
+  # @param [String] collection the collection we are using to persist this collection
+  def initialize( hostname, db, collection )
+    Mongo::Logger.logger.level = ::Logger::INFO
+    client = Mongo::Client.new([hostname], :database => db)
+    @collection = client[collection]
+  end
+
+
+  # Pushes (appends) the given hash on to the end of this persisted collection
+  #
+  # @param [Hash] item the object we want to append
+  # @return [MongoPersistedCollection] the persisted collection itself, so several appends may be chained together
+  def push( item )
+    @collection.insert_one item
+    self
+  end
+
+
+  # Deletes the first element from this persisted collection that is equal to item
+  #
+  # @param [Hash] item the object we want to delete
+  # @return [Hash] the object we just deleted
+  def delete( item )
+    from_bson_to_hash @collection.find(item).find_one_and_delete
+  end
+
+
+  # Replaces the first element from this persisted array that matches item, with replacement
+  #
+  # @param [Hash] replacement for the current element
+  # @return [Hahs] the item that was replaced, {} if the element wasn't in the collection
+  def replace( item, replacement )
+    r = delete item
+    push replacement
+    r
+  end
+
+
+  # Returns an array representation of this collection
+  #
+  # @return [Array<Hash>] array representation of this persisted collection
+  def to_a
+    ta = Array.new
+    @collection.find.each do |doc|
+      ta.push from_bson_to_hash(doc)
+    end
+    ta
+  end
+
+  # Returns the length of the collection
+  #
+  # @return [Fixnum] the length of the collection
+  def length
+    @collection.find.count.to_i
+  end
+
+  private
+
+
+  def from_bson_to_hash( item )
+    h = item.to_h
+    h.delete '_id'
+    h
+  end
+
+end

data/lib/util/mongo_persisted_hash.rb

@@ -0,0 +1,120 @@
+require 'mongo'
+require 'pstore'
+
+# An hash that is automatically persisted to a MongoDB document.
+# This class behaves *similarly* to a regular Hash but it persists every operation
+# to a specified MongoDB document.
+# Not all Hash operations are supported and we added some of our own.
+class MongoPersistedHash
+
+  # Creates a new MongoPersistedHash that is persisted as a document
+  # with _id +name+ inside a MongoDB collection
+  #
+  # @param [String] hostname of the MongoDB server
+  # @param [String] db the database where we want to persist the array
+  # @param [String] collection the collection we are using to persist this collection
+  # @param [String] name the _id of the document we are using to persist this Hash
+  def initialize(  hostname, db, collection, name )
+    Mongo::Logger.logger.level = ::Logger::INFO
+    client = Mongo::Client.new([hostname], :database => db)
+    @collection = client[collection]
+    @doc_id = name
+  end
+
+
+  # Methods borrowed from Ruby's Hash class
+
+  def []( key )
+    hash = load_hash
+    hash[key]
+  end
+
+  def []=( key, val )
+    hash = load_hash
+    hash[key]=val
+    store_hash hash
+  end
+
+  def delete( key )
+    hash = load_hash
+    return_value = hash.delete key
+    store_hash hash
+    return_value
+  end
+
+  def empty?
+    hash = load_hash
+    hash.empty?
+  end
+
+  def has_key?( key )
+    hash = load_hash
+    hash.has_key? key
+  end
+
+  def include?( key )
+    has_key? key
+  end
+
+  def to_s
+    hash = load_hash
+    hash.to_s
+  end
+
+  def to_h
+    load_hash
+  end
+
+  def keys
+    hash = load_hash
+    hash.keys
+  end
+
+  def length
+    hash = load_hash
+    hash.length
+  end
+
+
+  # PersistedHash-only public methods
+
+  # Adds a <key, value> pair to the PersistedHash _only if_
+  # there is currently no value associated with the specified key.
+  # @return [Boolean] false if the key already exists, true if the
+  # <key, value> pair was added successfully
+  def add_key_value?(key, val)
+    hash = load_hash
+    return false if hash.key? key
+    hash[key] = val
+    store_hash hash
+    true
+  end
+
+  # Removes a <key, value> pair from the PersistedHash _only if_
+  # there is currently a value associated with the specified key.
+  # @return [Boolean] false if there is no value associated with
+  # the specified key, true otherwise
+  def delete_key_value?( key )
+    hash = load_hash
+    return false if hash.delete(key).nil?
+    store_hash hash
+    true
+  end
+
+
+  # private
+
+  def load_hash
+    r = @collection.find({_id: @doc_id}).limit(1).first
+    r.nil? ? {_id: @doc_id} : r
+  end
+
+
+  def store_hash(hash)
+    @collection.find({_id: @doc_id}).find_one_and_replace(hash, :upsert => :true)
+  end
+
+
+
+
+end

data/nutella_lib.gemspec

@@ -2,16 +2,16 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
-# stub: nutella_lib 0.4.2 ruby lib
+# stub: nutella_lib 0.4.3 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "nutella_lib"
-  s.version = "0.4.2"
+  s.version = "0.4.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib"]
   s.authors = ["Alessandro Gnoli"]
-  s.date = "2015-03-16"
+  s.date = "2015-03-26"
   s.description = "Implements the nutella protocol and exposes it natively to ruby developers"
   s.email = "tebemis@gmail.com"
   s.extra_rdoc_files = [
@@ -30,6 +30,7 @@ Gem::Specification.new do |s|
     "lib/nutella_lib/app_core.rb",
     "lib/nutella_lib/app_log.rb",
     "lib/nutella_lib/app_net.rb",
+    "lib/nutella_lib/app_persist.rb",
     "lib/nutella_lib/core.rb",
     "lib/nutella_lib/ext/kernel.rb",
     "lib/nutella_lib/log.rb",
@@ -37,11 +38,17 @@ Gem::Specification.new do |s|
     "lib/nutella_lib/noext.rb",
     "lib/nutella_lib/persist.rb",
     "lib/simple_mqtt_client/simple_mqtt_client.rb",
+    "lib/util/json_file_persisted_collection.rb",
+    "lib/util/json_file_persisted_hash.rb",
+    "lib/util/json_store.rb",
+    "lib/util/mongo_persisted_collection.rb",
+    "lib/util/mongo_persisted_hash.rb",
     "nutella_lib.gemspec",
     "test/helper.rb",
     "test/test_logger.rb",
     "test/test_nutella_net.rb",
     "test/test_nutella_net_app.rb",
+    "test/test_peristence.rb",
     "test/test_simple_mqtt_client.rb"
   ]
   s.homepage = "https://github.com/nutella-framework/nutella_lib.rb"
@@ -55,6 +62,7 @@ Gem::Specification.new do |s|
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<mqtt>, [">= 0.3", "~> 0.3"])
       s.add_runtime_dependency(%q<ansi>, [">= 1.4", "~> 1.5"])
+      s.add_runtime_dependency(%q<mongo>, [">= 2.0.0.rc", "~> 2.0.0.rc"])
       s.add_development_dependency(%q<shoulda>, [">= 3", "~> 3"])
       s.add_development_dependency(%q<minitest>, [">= 5", "~> 5.4"])
       s.add_development_dependency(%q<yard>, [">= 0.8.7", "~> 0.8"])
@@ -65,6 +73,7 @@ Gem::Specification.new do |s|
     else
       s.add_dependency(%q<mqtt>, [">= 0.3", "~> 0.3"])
       s.add_dependency(%q<ansi>, [">= 1.4", "~> 1.5"])
+      s.add_dependency(%q<mongo>, [">= 2.0.0.rc", "~> 2.0.0.rc"])
       s.add_dependency(%q<shoulda>, [">= 3", "~> 3"])
       s.add_dependency(%q<minitest>, [">= 5", "~> 5.4"])
       s.add_dependency(%q<yard>, [">= 0.8.7", "~> 0.8"])
@@ -76,6 +85,7 @@ Gem::Specification.new do |s|
   else
     s.add_dependency(%q<mqtt>, [">= 0.3", "~> 0.3"])
     s.add_dependency(%q<ansi>, [">= 1.4", "~> 1.5"])
+    s.add_dependency(%q<mongo>, [">= 2.0.0.rc", "~> 2.0.0.rc"])
     s.add_dependency(%q<shoulda>, [">= 3", "~> 3"])
     s.add_dependency(%q<minitest>, [">= 5", "~> 5.4"])
     s.add_dependency(%q<yard>, [">= 0.8.7", "~> 0.8"])

data/test/test_nutella_net_app.rb

@@ -99,6 +99,4 @@ class TestNutellaNetApp < MiniTest::Test
   #   sleep 2
   # end
 
-  # TODO do more tests for app to run APIs and broadcasting
-
 end

data/test/test_peristence.rb

@@ -0,0 +1,48 @@
+require 'helper'
+
+require 'util/mongo_persisted_collection'
+require 'util/json_file_persisted_collection'
+require 'util/mongo_persisted_hash'
+require 'util/json_file_persisted_hash'
+
+
+class TestNutellaNetApp < MiniTest::Test
+
+  def test_mongo_persisted_collection
+    # pa = MongoPersistedCollection.new 'ltg.evl.uic.edu', 'nutella_test', 'test_collection'
+    # pa.push( {an: 'object'} )
+    # pa.push( {another: 'object'} )
+    # pa.push( {idx_2: 'object'} )
+    # pa.push( {idx_3: 'object'} )
+    # pa.push( {idx_4: 'object'} )
+    # p pa.replace( {ciccio: 'pasticcio'}, {ciccio: 'pasticcio'} )
+    # p pa.length
+    # p pa.to_a
+  end
+
+
+  def test_json_file_persisted_collection
+    # pc = JSONFilePersistedCollection.new 'test.json'
+    # # pc.push({an: 'object'}).push({another: 'object'})
+    # p pc.length
+    # p pc.to_a
+    # p pc.replace({'an' => 'object'}, {'with_another' => 'object'})
+  end
+
+
+  def test_json_file_persisted_hash
+    # ph = JSONFilePersistedHash.new 'test.json'
+    # p ph['test']
+    # p ph['test'] = 'yes'
+    # p ph.delete_key_value? 'test'
+    # p ph.add_key_value? 'test', 'pippo'
+  end
+
+
+  def test_mongo_persisted_hash
+    # ph = MongoPersistedHash.new 'ltg.evl.uic.edu', 'nutella_test', 'hash_test', 'my_hash'
+    # ph['ciao'] = 'bello'
+    # p ph.to_h
+  end
+
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: nutella_lib
 version: !ruby/object:Gem::Version
-  version: 0.4.2
+  version: 0.4.3
 platform: ruby
 authors:
 - Alessandro Gnoli
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-16 00:00:00.000000000 Z
+date: 2015-03-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mqtt
@@ -50,6 +50,26 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.5'
+- !ruby/object:Gem::Dependency
+  name: mongo
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.0.0.rc
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 2.0.0.rc
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.0.0.rc
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 2.0.0.rc
 - !ruby/object:Gem::Dependency
   name: shoulda
   requirement: !ruby/object:Gem::Requirement
@@ -209,6 +229,7 @@ files:
 - lib/nutella_lib/app_core.rb
 - lib/nutella_lib/app_log.rb
 - lib/nutella_lib/app_net.rb
+- lib/nutella_lib/app_persist.rb
 - lib/nutella_lib/core.rb
 - lib/nutella_lib/ext/kernel.rb
 - lib/nutella_lib/log.rb
@@ -216,11 +237,17 @@ files:
 - lib/nutella_lib/noext.rb
 - lib/nutella_lib/persist.rb
 - lib/simple_mqtt_client/simple_mqtt_client.rb
+- lib/util/json_file_persisted_collection.rb
+- lib/util/json_file_persisted_hash.rb
+- lib/util/json_store.rb
+- lib/util/mongo_persisted_collection.rb
+- lib/util/mongo_persisted_hash.rb
 - nutella_lib.gemspec
 - test/helper.rb
 - test/test_logger.rb
 - test/test_nutella_net.rb
 - test/test_nutella_net_app.rb
+- test/test_peristence.rb
 - test/test_simple_mqtt_client.rb
 homepage: https://github.com/nutella-framework/nutella_lib.rb
 licenses: