palsy 0.0.2 → 0.0.3

data/CHANGELOG.md

@@ -1,6 +1,9 @@
-* 0.0.2 - February 23, 2003
+* 0.0.3 - April 2, 2013
+  * Ensure exclusive transactions are being used for all operations. This
+    should make it a little more viable for non-MRI things.
+* 0.0.2 - February 23, 2013
   * if Palsy::List is put into a situation where it will try to replace itself
     with an empty array, it would generate a SQL syntax error.
   * Fixes for unit testing / build environment
-* 0.0.1 - February 10, 2003
+* 0.0.1 - February 10, 2013
   * Initial Release

data/Gemfile

@@ -2,5 +2,3 @@ source 'https://rubygems.org'
 
 # Specify your gem's dependencies in palsy.gemspec
 gemspec
-
-gem 'guard-rake', :git => "https://github.com/erikh/guard-rake", :branch => "failure_ok"

data/Guardfile

@@ -5,6 +5,6 @@ guard 'minitest' do
   watch(%r|^test/helper\.rb|)    { "test" }
 end
 
-guard 'rake', :failure_ok => true, :run_on_all => false, :task => 'rdoc_cov' do
+guard 'rake', :run_on_all => false, :task => 'rdoc_cov' do
   watch(%r|^lib/(.*)([^/]+)\.rb|)
 end

data/Rakefile

@@ -10,7 +10,8 @@ end
 
 RDoc::Task.new do |rdoc|
   rdoc.title = "Palsy: a simple sqlite layer for persisting data structures"
-  rdoc.rdoc_files.include("lib/**/*.rb")
+  rdoc.main = "README.md"
+  rdoc.rdoc_files.include("README.md", "lib/**/*.rb")
   rdoc.rdoc_files -= ["lib/palsy/version.rb"]
   if ENV["RDOC_COVER"]
     rdoc.options << "-C"

data/lib/palsy.rb

@@ -87,6 +87,19 @@ class Palsy < DelegateClass(SQLite3::Database)
       SQLite3::Database.new(self.class.database)
     end
   end
+
+  #
+  # Execute this query in an exclusive transaction.
+  #
+  def execute_t(query, args=[], &block)
+    result = nil
+
+    transaction(:exclusive) do
+      result = execute(query, args, &block)
+    end
+
+    return result
+  end
 end
 
 require 'palsy/basic'

data/lib/palsy/basic/generic.rb

@@ -12,7 +12,7 @@ class Palsy
   #
   #     class Palsy::Object < Palsy::Generic
   #       def create_table
-  #         @db.execute %Q[
+  #         @db.execute_t %Q[
   #           create table if not exists #{@table_name} (
   #             id integer not null primary key autoincrement,
   #             key varchar(255) not null,

data/lib/palsy/basic/list.rb

@@ -37,7 +37,7 @@ class Palsy
     # Add a value to the tail of the list.
     #
     def push(val)
-      @db.execute(
+      @db.execute_t(
         "insert into #{@table_name} (name, value) values (?, ?)",
         [@object_name, Marshal.dump(val)]
       )
@@ -86,7 +86,7 @@ class Palsy
 
       value_string = ("(?, ?)," * ary.count).chop
 
-      @db.execute(
+      @db.execute_t(
           "insert into #{@table_name} (name, value) values #{value_string}",
           ary.map { |x| [@object_name, Marshal.dump(x)] }.flatten
       )
@@ -96,7 +96,7 @@ class Palsy
     # Empty the list.
     #
     def clear
-      @db.execute("delete from #{@table_name} where name=?", [@object_name])
+      @db.execute_t("delete from #{@table_name} where name=?", [@object_name])
     end
 
     #
@@ -111,7 +111,7 @@ class Palsy
     # Convert the list to a Ruby Array.
     #
     def to_a
-      @db.execute(
+      @db.execute_t(
         "select value from #{@table_name} where name=? order by id",
         [@object_name]
       ).map { |x| Marshal.load(x.first) }
@@ -121,7 +121,7 @@ class Palsy
     # Define the schema for this type.
     #
     def create_table
-      @db.execute <<-EOF
+      @db.execute_t <<-EOF
         create table if not exists #{@table_name} (
           id integer not null primary key autoincrement,
           name varchar(255) not null,
@@ -129,7 +129,7 @@ class Palsy
         )
       EOF
 
-      @db.execute "create index if not exists #{@table_name}_name_index on #{@table_name} (name)"
+      @db.execute_t "create index if not exists #{@table_name}_name_index on #{@table_name} (name)"
     end
   end
 end

data/lib/palsy/basic/map.rb

@@ -40,7 +40,7 @@ class Palsy
     # entry.
     #
     def [](key)
-      value = @db.execute("select value from #{@table_name} where name=? and key=?", [@object_name, Marshal.dump(key)]).first.first rescue nil
+      value = @db.execute_t("select value from #{@table_name} where name=? and key=?", [@object_name, Marshal.dump(key)]).first.first rescue nil
       return value && Marshal.load(value)
     end
 
@@ -50,7 +50,7 @@ class Palsy
     #
     def []=(key, value)
       delete(key)
-      @db.execute("insert into #{@table_name} (name, key, value) values (?, ?, ?)", [@object_name, Marshal.dump(key), Marshal.dump(value)])
+      @db.execute_t("insert into #{@table_name} (name, key, value) values (?, ?, ?)", [@object_name, Marshal.dump(key), Marshal.dump(value)])
       value
     end
 
@@ -68,7 +68,7 @@ class Palsy
     # Convert this map to a Ruby Hash object.
     #
     def to_hash
-      rows = @db.execute("select key, value from #{@table_name} where name=?", [@object_name])
+      rows = @db.execute_t("select key, value from #{@table_name} where name=?", [@object_name])
       Hash[rows.map { |x| x.map { |y| Marshal.load(y) } }]
     end
 
@@ -76,7 +76,7 @@ class Palsy
     # Defines the schema for Maps.
     #
     def create_table
-      @db.execute <<-EOF
+      @db.execute_t <<-EOF
         create table if not exists #{@table_name} (
           id integer not null primary key autoincrement,
           name varchar(255) not null,
@@ -86,7 +86,7 @@ class Palsy
         )
       EOF
 
-      @db.execute "create index if not exists #{@table_name}_name_idx on #{@table_name} (name)"
+      @db.execute_t "create index if not exists #{@table_name}_name_idx on #{@table_name} (name)"
     end
   end
 end

data/lib/palsy/basic/object.rb

@@ -27,7 +27,7 @@ class Palsy
     # Get an object by referencing its key. Returns nil unless it exists.
     #
     def [](key)
-      value = @db.execute("select value from #{@table_name} where key=?", [key]).first.first rescue nil
+      value = @db.execute_t("select value from #{@table_name} where key=?", [key]).first.first rescue nil
       return value && Marshal.load(value)
     end
 
@@ -36,7 +36,7 @@ class Palsy
     #
     def []=(key, value)
       delete(key)
-      @db.execute("insert into #{@table_name} (key, value) values (?, ?)", [key, Marshal.dump(value)])
+      @db.execute_t("insert into #{@table_name} (key, value) values (?, ?)", [key, Marshal.dump(value)])
       value
     end
 
@@ -44,14 +44,14 @@ class Palsy
     # Deletes an object.
     #
     def delete(key)
-      @db.execute("delete from #{@table_name} where key=?", [key])
+      @db.execute_t("delete from #{@table_name} where key=?", [key])
     end
 
     #
     # Defines the schema for this data type.
     #
     def create_table
-      @db.execute <<-EOF
+      @db.execute_t <<-EOF
         create table if not exists #{@table_name} (
           id integer not null primary key autoincrement,
           key varchar(255) not null,

data/lib/palsy/basic/set.rb

@@ -42,21 +42,21 @@ class Palsy
     #
     def add(key)
       delete(key)
-      @db.execute("insert into #{@table_name} (name, key) values (?, ?)", [@object_name, Marshal.dump(key)])
+      @db.execute_t("insert into #{@table_name} (name, key) values (?, ?)", [@object_name, Marshal.dump(key)])
     end
 
     #
     # Remove a value from the Set.
     #
     def delete(key)
-      @db.execute("delete from #{@table_name} where name=? and key=?", [@object_name, Marshal.dump(key)])
+      @db.execute_t("delete from #{@table_name} where name=? and key=?", [@object_name, Marshal.dump(key)])
     end
 
     #
     # Predicate to determine if a value is in this set.
     #
     def has_key?(key)
-      @db.execute("select count(*) from #{@table_name} where name=? and key=?", [@object_name, Marshal.dump(key)]).first.first.to_i > 0
+      @db.execute_t("select count(*) from #{@table_name} where name=? and key=?", [@object_name, Marshal.dump(key)]).first.first.to_i > 0
     end
 
     alias include? has_key?
@@ -65,7 +65,7 @@ class Palsy
     # Remove all values from the set.
     #
     def clear
-      @db.execute("delete from #{@table_name} where name=?", [@object_name])
+      @db.execute_t("delete from #{@table_name} where name=?", [@object_name])
     end
 
     #
@@ -79,14 +79,14 @@ class Palsy
 
       value_string = ("(?, ?)," * set.count).chop
 
-      @db.execute("insert into #{@table_name} (name, key) values #{value_string}", set.map { |x| [@object_name, Marshal.dump(x)] }.flatten)
+      @db.execute_t("insert into #{@table_name} (name, key) values #{value_string}", set.map { |x| [@object_name, Marshal.dump(x)] }.flatten)
     end
 
     #
     # Return a ruby Array of the set. Used for #to_a and #to_set by various Ruby libraries.
     #
     def keys
-      @db.execute("select distinct key from #{@table_name} where name=?", [@object_name]).map { |x| Marshal.load(x.first) }
+      @db.execute_t("select distinct key from #{@table_name} where name=?", [@object_name]).map { |x| Marshal.load(x.first) }
     end
 
     #
@@ -100,7 +100,7 @@ class Palsy
     # Defines the schema for a set.
     #
     def create_table
-      @db.execute <<-EOF
+      @db.execute_t <<-EOF
         create table if not exists #{@table_name} (
           id integer not null primary key autoincrement,
           name varchar(255) not null,
@@ -109,7 +109,7 @@ class Palsy
         )
       EOF
 
-      @db.execute "create index if not exists #{@table_name}_name_idx on #{@table_name} (name)"
+      @db.execute_t "create index if not exists #{@table_name}_name_idx on #{@table_name} (name)"
     end
   end
 end

data/lib/palsy/version.rb

@@ -1 +1 @@
-PalsyVersion = "0.0.2"
+PalsyVersion = "0.0.3"

data/palsy.gemspec

@@ -21,9 +21,9 @@ Gem::Specification.new do |gem|
 
   gem.add_development_dependency 'minitest', '~> 4.5.0'
   gem.add_development_dependency 'rake'
-  gem.add_development_dependency 'rdoc', "~> 3.12"
+  gem.add_development_dependency 'rdoc', "~> 4"
   gem.add_development_dependency 'simplecov'
   gem.add_development_dependency 'guard-minitest'
-  gem.add_development_dependency 'guard-rake'
+  gem.add_development_dependency 'guard-rake', '~> 0.0.8'
   gem.add_development_dependency 'rb-fsevent'
 end

data/test/test_list.rb

@@ -6,6 +6,17 @@ class TestList < PalsyTypeTest
     @list = Palsy::List.new('test_list', 'a_list')
   end
 
+  def test_threaded_operation
+    syms = [:foo, :bar, :baz]
+    t = syms.map do |x|
+      Thread.new { @list.push(x) }
+    end
+
+    t.each(&:join)
+
+    assert_equal(syms.sort, @list.to_a.sort)
+  end
+
   def test_semantics
     assert_empty(@list.to_a, 'an uninitialized list with no data is empty')
   end

data/test/test_map.rb

@@ -7,6 +7,17 @@ class TestMap < PalsyTypeTest
     @map2 = Palsy::Map.new('test_map', 'a_map')
   end
 
+  def test_threaded_operation
+    args = { :foo => 2, :bar => 3, :baz => 4 }
+    t = args.map do |k, v|
+      Thread.new { @map[k] = v }
+    end
+
+    t.each(&:join)
+
+    assert_equal(@map.to_hash, args)
+  end
+
   def test_inherits
     assert_includes(Palsy::Map.ancestors, Palsy::Set, 'maps are also sets')
   end

data/test/test_object.rb

@@ -1,6 +1,21 @@
 require 'helper'
 
 class TestObject < PalsyTypeTest
+  def test_threaded_operation
+    obj = Palsy::Object.new('test_object')
+
+    args = { 'foo' => 2, 'bar' => 3, 'baz' => 4 }
+    t = args.map do |k, v|
+      Thread.new { obj[k] = v }
+    end
+
+    t.each(&:join)
+
+    args.each do |k,v|
+      assert_equal(obj[k], args[k])
+    end
+  end
+
   def test_index
     obj   = Palsy::Object.new('test_object')
     obj2  = Palsy::Object.new('test_object')

data/test/test_set.rb

@@ -6,6 +6,17 @@ class TestSet < PalsyTypeTest
     @set = Palsy::Set.new('test_set', 'a_set')
   end
 
+  def test_threaded_operation
+    syms = [:foo, :bar, :baz]
+    t = syms.map do |x|
+      Thread.new { @set.add(x) }
+    end
+
+    t.each(&:join)
+
+    assert_equal(syms.sort, @set.to_a.sort)
+  end
+
   def test_semantics
     assert_empty(@set.to_set, 'an uninitialized set is empty')
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: palsy
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-23 00:00:00.000000000 Z
+date: 2013-04-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sqlite3
@@ -66,7 +66,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '3.12'
+        version: '4'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -74,7 +74,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '3.12'
+        version: '4'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
@@ -112,17 +112,17 @@ dependencies:
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.0.8
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.0.8
 - !ruby/object:Gem::Dependency
   name: rb-fsevent
   requirement: !ruby/object:Gem::Requirement
@@ -186,7 +186,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -599058759357210586
+      hash: 3156010217290385344
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -195,7 +195,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -599058759357210586
+      hash: 3156010217290385344
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.25