json_store 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 49e14dd153040a235c67133f3df7faeb1357ae9f
-  data.tar.gz: b7f1b9de726f8f9da032f01260ee3f4365f94635
+  metadata.gz: bfcfc3af69aa015556ac14133eaa9e7c73241017
+  data.tar.gz: ae79607a47bbc64c2548a4a834787dbe16f6a383
 SHA512:
-  metadata.gz: a85d3a673bbce87fc59532f65895852e76afe1c83c899a4777a72223ceb9ec9dbb072816b2f3c95cde2090a1110ba090751f490f1c1418fc5338c5f904ebdf33
-  data.tar.gz: 3246102a9104e11127f467ee7a542789c9e6812c64527827a9b700469d9e9b00da135243a329f0daeca2a40650a7eca2c0fd00fba1db138f43a45d849e008f1f
+  metadata.gz: f1f1bb2d50d7529fd47ab19e3bc0d9d8886375b5dfff265b164920778866bb801dae03367f801156f396ee3502b8e2291649bc55df5d3ddd0f989c97d2f7b8b7
+  data.tar.gz: 689bc07143cd4b59f18344d82240fe8a90ba05fd306df36afc1ac91984311ac7f2a42d5e1d226ba323957ed7d9034e393eada766fd265150c8d4d259e8324794

data/.travis.yml

@@ -0,0 +1,3 @@
+language: ruby 
+rvm:
+ - 2.1.0

data/README.md

@@ -21,6 +21,35 @@ db.merge
 db.push
 ```
 
+* Peristing more complex things like custom objects
+
+```ruby
+
+class Person
+
+  def initialize(first,last)
+    @first = first
+    @last = last
+  end
+
+  def first
+    @first
+  end
+
+  def last
+    @last
+  end
+
+end
+
+db = JsonStore.new('people')
+db.pull
+db.set(:person,Person.new('Kingsley','Hendrickse'))
+db.push
+p db.get(:person).first # Kingsley
+
+```
+
 There are only a handful of commands:
 
 * pull

data/VERSION

@@ -1 +1 @@
-0.1.0
+0.1.1

data/json_store.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: json_store 0.1.0 ruby lib
+# stub: json_store 0.1.1 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "json_store"
-  s.version = "0.1.0"
+  s.version = "0.1.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib"]
   s.authors = ["Kingsley Hendrickse"]
-  s.date = "2014-06-19"
+  s.date = "2014-06-23"
   s.description = "A simple in memory key/value database using json that writes to file"
   s.email = "kingsleyhendrickse@me.com"
   s.extra_rdoc_files = [
@@ -20,14 +20,18 @@ Gem::Specification.new do |s|
   ]
   s.files = [
     ".document",
+    ".travis.yml",
     "Gemfile",
-    "Gemfile.lock",
     "LICENSE.txt",
     "README.md",
     "Rakefile",
     "VERSION",
     "json_store.gemspec",
-    "lib/json_store.rb"
+    "lib/json_store.rb",
+    "spec/json_store_spec.rb",
+    "spec/test_data/test1.json",
+    "spec/test_data/test2.json",
+    "spec/test_data/test3.json"
   ]
   s.homepage = "http://github.com/kingsleyh/json_store"
   s.licenses = ["MIT"]

data/lib/json_store.rb

@@ -21,12 +21,16 @@ class JsonStore
     @map
   end
 
+  def clear
+    @map = {}
+  end
+
   def all_as_json
     Oj.dump(@map)
   end
 
-  def search(selector,kind=:matches)
-    JSONSelect(selector).send(kind,@map)
+  def search(selector, kind=:matches)
+    JSONSelect(selector).send(kind, @map)
   end
 
   def get_as_json(key)
@@ -35,7 +39,7 @@ class JsonStore
 
   def pull
     begin
-      @map = read
+      @map = read_data
     rescue LockMethod::Locked
       sleep 0.5
       pull
@@ -44,7 +48,7 @@ class JsonStore
 
   def push
     begin
-      write
+      write_data
     rescue LockMethod::Locked
       sleep 0.5
       push
@@ -53,20 +57,24 @@ class JsonStore
 
   def merge(direction=:into_remote)
     begin
-      direction == :into_local ? @map.merge!(read) : read.merge!(@map)
+      @map = direction == :into_local ? @map.merge(read_data) : read_data.merge(@map)
     rescue LockMethod::Locked
       sleep 0.5
       merge(direction)
     end
   end
 
-  def as_lock
-    'json_store'
+  def db_path
+    @db
   end
 
   private
 
-  def read
+  def as_lock
+    'json_store'
+  end
+
+  def read_data
     data = {}
     if File.exists?(@db)
       f = File.read(@db)
@@ -75,16 +83,15 @@ class JsonStore
     data
   end
 
-  lock_method :read
+  lock_method :read_data
 
-  def write
-    File.open(@db, 'w') { |f| f.write(Oj.dump(@map)) }
+  def write_data
+    f = File.new(@db, 'w')
+    f.write(Oj.dump(@map))
+    f.close
   end
 
-  lock_method :write
+  lock_method :write_data
 
-  def keep_trying
-
-  end
 
 end

data/spec/json_store_spec.rb

@@ -0,0 +1,141 @@
+require 'rspec'
+require 'fileutils'
+require File.dirname(__FILE__) + '/../lib/json_store'
+
+describe JsonStore do
+
+  it 'should populate the memory map from file on pull' do
+    db = JsonStore.new(File.dirname(__FILE__) + '/test_data/test1.json')
+    db.pull
+    expect(db.all).to eq({'name' => 'Kingsley'})
+  end
+
+  it 'should create new db if none already exists during push' do
+    db = create_new_db('test2.json')
+    expect(File.exists?(db.db_path)).to eq(true)
+  end
+
+  it 'should replace file with memory map on push overwriting same keys in file with map data' do
+    db = create_new_db('test2.json')
+    expect(db.all).to eq({name: 'Kingsley'})
+    db.set(:name, 'Kostas')
+    db.set(:slot, 'PM')
+    db.push
+    db.pull
+    expect(db.all).to eq({name: 'Kostas', slot: 'PM'})
+  end
+
+  it 'should merge memory map changes into file on merge into_remote' do
+    db = create_new_db('test2.json')
+    expect(db.all).to eq({name: 'Kingsley'})
+    db.set(:name, 'Kostas')
+    db.set(:slot, 'PM')
+    db.merge
+    expect(db.all).to eq({name: 'Kostas', slot: 'PM'})
+  end
+
+  it 'should merge file changes into memory map on merge into_local' do
+    db = create_new_db('test2.json')
+    expect(db.all).to eq({name: 'Kingsley'})
+    db.set(:name, 'Kostas')
+    db.set(:slot, 'PM')
+    db.merge(:into_local)
+    expect(db.all).to eq({name: 'Kingsley', slot: 'PM'})
+  end
+
+  it 'should get value by by key of stored items' do
+    db = JsonStore.new(File.dirname(__FILE__) + '/test_data/test1.json')
+    db.pull
+    expect(db.get('name')).to eq('Kingsley')
+  end
+
+  it 'should return json on get_as_json' do
+    db = JsonStore.new(File.dirname(__FILE__) + '/test_data/test1.json')
+    db.pull
+    expect(db.get_as_json('name')).to eq('"Kingsley"')
+  end
+
+  it 'should return json on all_as_json' do
+    db = JsonStore.new(File.dirname(__FILE__) + '/test_data/test1.json')
+    db.pull
+    expect(db.all_as_json).to eq('{"name":"Kingsley"}')
+  end
+
+  it 'should search basic json structure using json select' do
+    db = create_new_db('test2.json', {people: [{first_name: 'Kingsley', last_name: 'Hendrickse'}, {first_name: 'Kostas', last_name: 'Mamalis'}]})
+    expect(db.search('.people .first_name')).to eq(['Kingsley', 'Kostas'])
+    expect(db.search('.people .first_name', :match)).to eq('Kingsley')
+    expect(db.search('.people .first_name', :test)).to eq(true)
+  end
+
+  it 'should be able to store a more complex object' do
+    class Person;
+      attr_accessor :first_name, :last_name;
+
+      def initialize(name)
+        ; d = name.split(' '); @first_name = d.first; @last_name = d.last;
+      end
+
+      ;
+    end
+    db = create_new_db('test2.json', {people: [Person.new('Kingsley Hendrickse'), Person.new('Kostas Mamalis')]})
+    expect(db.get(:people).map { |person| person.first_name }).to eq(['Kingsley', 'Kostas'])
+  end
+
+  it 'should clear the in memory map' do
+    db = create_new_db('test2.json')
+    db.clear
+    expect(db.all).to eq({})
+  end
+
+  it 'should work with simple scenario' do
+    db = create_new_db('test2.json')
+    data = {day: 'Mon', year: '2014'}
+    db.set(:date, data)
+    db.push
+    expect(db.get(:date)).to eq(data)
+    db2 = JsonStore.new(File.dirname(__FILE__) + '/test_data/test2.json')
+    db2.pull
+    db2.set(:slot, 'PM')
+    db2.push
+    db.merge
+    expect(db.all).to eq(name: 'Kingsley', date: {day: 'Mon', year: '2014'}, slot: 'PM')
+  end
+
+  it 'should lock to prevent concurrent access' do
+    t1 = Thread.new {
+      20.times{
+      db = create_new_db('test3.json')
+      db.set(:slot, "1_PM")
+      db.merge
+      db.push
+      }
+    }
+    t2 = Thread.new {
+      20.times {
+      db = create_new_db('test3.json')
+      db.set(:slot, "2_PM")
+      db.merge
+      db.push
+      }
+    }
+    t2.join
+    t1.join
+    db2 = JsonStore.new(File.dirname(__FILE__) + '/test_data/test3.json')
+    db2.pull
+    expect(db2.get(:slot)).to match(/PM/)
+
+  end
+
+  private
+
+  def create_new_db(path, content={name: 'Kingsley'})
+    file_path = File.dirname(__FILE__) + "/test_data/#{path}"
+    FileUtils.rm_rf(file_path)
+    db = JsonStore.new(file_path)
+    db.set(content.keys.first, content[content.keys.first])
+    db.push
+    db
+  end
+
+end

data/spec/test_data/test1.json

@@ -0,0 +1 @@
+{"name":"Kingsley"}

data/spec/test_data/test2.json

@@ -0,0 +1 @@
+{":name":"Kingsley",":date":{":day":"Mon",":year":"2014"},":slot":"PM"}

data/spec/test_data/test3.json

@@ -0,0 +1 @@
+{":name":"Kingsley",":slot":"1_PM"}

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: json_store
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Kingsley Hendrickse
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-19 00:00:00.000000000 Z
+date: 2014-06-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: oj
@@ -103,14 +103,18 @@ extra_rdoc_files:
 - README.md
 files:
 - ".document"
+- ".travis.yml"
 - Gemfile
-- Gemfile.lock
 - LICENSE.txt
 - README.md
 - Rakefile
 - VERSION
 - json_store.gemspec
 - lib/json_store.rb
+- spec/json_store_spec.rb
+- spec/test_data/test1.json
+- spec/test_data/test2.json
+- spec/test_data/test3.json
 homepage: http://github.com/kingsleyh/json_store
 licenses:
 - MIT

data/Gemfile.lock

@@ -1,92 +0,0 @@
-GEM
-  remote: http://rubygems.org/
-  specs:
-    activesupport (4.1.1)
-      i18n (~> 0.6, >= 0.6.9)
-      json (~> 1.7, >= 1.7.7)
-      minitest (~> 5.1)
-      thread_safe (~> 0.1)
-      tzinfo (~> 1.1)
-    addressable (2.3.6)
-    builder (3.2.2)
-    cache (0.4.0)
-    descendants_tracker (0.0.4)
-      thread_safe (~> 0.3, >= 0.3.1)
-    diff-lcs (1.2.5)
-    faraday (0.9.0)
-      multipart-post (>= 1.2, < 3)
-    git (1.2.7)
-    github_api (0.11.3)
-      addressable (~> 2.3)
-      descendants_tracker (~> 0.0.1)
-      faraday (~> 0.8, < 0.10)
-      hashie (>= 1.2)
-      multi_json (>= 1.7.5, < 2.0)
-      nokogiri (~> 1.6.0)
-      oauth2
-    hashie (3.0.0)
-    highline (1.6.21)
-    i18n (0.6.9)
-    jeweler (2.0.1)
-      builder
-      bundler (>= 1.0)
-      git (>= 1.2.5)
-      github_api
-      highline (>= 1.6.15)
-      nokogiri (>= 1.5.10)
-      rake
-      rdoc
-    json (1.8.1)
-    json_select (0.1.4)
-      treetop
-    jwt (1.0.0)
-    lock_method (0.5.5)
-      activesupport
-      cache (>= 0.2.1)
-    mini_portile (0.6.0)
-    minitest (5.3.5)
-    multi_json (1.10.1)
-    multi_xml (0.5.5)
-    multipart-post (2.0.0)
-    nokogiri (1.6.2.1)
-      mini_portile (= 0.6.0)
-    oauth2 (0.9.4)
-      faraday (>= 0.8, < 0.10)
-      jwt (~> 1.0)
-      multi_json (~> 1.3)
-      multi_xml (~> 0.5)
-      rack (~> 1.2)
-    oj (2.9.6)
-    polyglot (0.3.5)
-    rack (1.5.2)
-    rake (10.3.2)
-    rdoc (4.1.1)
-      json (~> 1.4)
-    rspec (3.0.0)
-      rspec-core (~> 3.0.0)
-      rspec-expectations (~> 3.0.0)
-      rspec-mocks (~> 3.0.0)
-    rspec-core (3.0.1)
-      rspec-support (~> 3.0.0)
-    rspec-expectations (3.0.1)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.0.0)
-    rspec-mocks (3.0.1)
-      rspec-support (~> 3.0.0)
-    rspec-support (3.0.0)
-    thread_safe (0.3.4)
-    treetop (1.5.3)
-      polyglot (~> 0.3)
-    tzinfo (1.2.1)
-      thread_safe (~> 0.1)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  bundler (~> 1.0)
-  jeweler (~> 2.0.1)
-  json_select
-  lock_method
-  oj
-  rspec (~> 3.0.0.rc1)