micro_sql 0.3.2 → 0.4.1

data/.gitignore

@@ -0,0 +1,49 @@
+# rcov generated
+coverage
+coverage.data
+
+# rdoc generated
+rdoc
+
+# yard generated
+doc
+.yardoc
+
+# bundler
+.bundle
+
+# jeweler generated
+pkg
+
+# Have editor/IDE/OS specific files you need to ignore? Consider using a global gitignore: 
+#
+# * Create a file at ~/.gitignore
+# * Include files you want ignored
+# * Run: git config --global core.excludesfile ~/.gitignore
+#
+# After doing this, these files will be ignored in all your git projects,
+# saving you from having to 'pollute' every project you touch with them
+#
+# Not sure what to needs to be ignored for particular editors/OSes? Here's some ideas to get you started. (Remember, remove the leading # of the line)
+#
+# For MacOS:
+#
+#.DS_Store
+
+# For TextMate
+#*.tmproj
+#tmtags
+
+# For emacs:
+#*~
+#\#*
+#.\#*
+
+# For vim:
+#*.swp
+
+# For redcar:
+#.redcar
+
+# For rubinius:
+#*.rbc

data/Gemfile

@@ -9,8 +9,10 @@ gem "sqlite3"
 # Add dependencies to develop your gem here.
 # Include everything needed to run rake, tests, features, etc.
 group :development do
+  gem "rake"
+  gem "rdoc"
+
   gem "bundler"
-  gem "jeweler"
   gem 'simplecov', :require => false
   gem "ruby-debug19"
 end

data/Gemfile.lock

@@ -3,19 +3,13 @@ GEM
   specs:
     archive-tar-minitar (0.5.2)
     columnize (0.3.6)
-    git (1.2.5)
-    jeweler (1.8.3)
-      bundler (~> 1.0)
-      git (>= 1.2.5)
-      rake
-      rdoc
-    json (1.6.6)
+    json (1.7.7)
     linecache19 (0.5.12)
       ruby_core_source (>= 0.1.4)
-    multi_json (1.2.0)
-    pg (0.13.2)
-    rake (0.9.2.2)
-    rdoc (3.12)
+    multi_json (1.7.2)
+    pg (0.15.0)
+    rake (10.0.4)
+    rdoc (4.0.1)
       json (~> 1.4)
     ruby-debug-base19 (0.11.25)
       columnize (>= 0.3.1)
@@ -27,19 +21,20 @@ GEM
       ruby-debug-base19 (>= 0.11.19)
     ruby_core_source (0.1.5)
       archive-tar-minitar (>= 0.5.2)
-    simplecov (0.6.1)
+    simplecov (0.7.1)
       multi_json (~> 1.0)
-      simplecov-html (~> 0.5.3)
-    simplecov-html (0.5.3)
-    sqlite3 (1.3.5)
+      simplecov-html (~> 0.7.1)
+    simplecov-html (0.7.1)
+    sqlite3 (1.3.7)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
   bundler
-  jeweler
   pg
+  rake
+  rdoc
   ruby-debug19
   simplecov
   sqlite3

data/Rakefile

@@ -2,6 +2,8 @@
 
 require 'rubygems'
 require 'bundler'
+require "bundler/gem_tasks"
+
 begin
   Bundler.setup(:default, :development)
 rescue Bundler::BundlerError => e
@@ -11,20 +13,6 @@ rescue Bundler::BundlerError => e
 end
 require 'rake'
 
-require 'jeweler'
-Jeweler::Tasks.new do |gem|
-  # gem is a Gem::Specification... see http://docs.rubygems.org/read/chapter/20 for more options
-  gem.name = "micro_sql"
-  gem.homepage = "http://github.com/radiospiel/micro_sql"
-  gem.license = "MIT"
-  gem.summary = %Q{A minimal ruby interface for SQL databases}
-  gem.description = %Q{You only need a single method to talk to your database...}
-  gem.email = "eno@open-lab.org"
-  gem.authors = ["radiospiel"]
-  # dependencies defined in Gemfile
-end
-Jeweler::RubygemsDotOrgTasks.new
-
 require 'rake/testtask'
 Rake::TestTask.new(:test) do |test|
   test.libs << 'lib' << 'test'
@@ -51,3 +39,4 @@ Rake::RDocTask.new do |rdoc|
   rdoc.rdoc_files.include('README*')
   rdoc.rdoc_files.include('lib/**/*.rb')
 end
+

data/lib/micro_sql/key_value_table.rb

@@ -4,7 +4,13 @@ require "json"
 
 class MicroSql::KeyValueTable < MicroSql::Table
   def initialize(db, table_name = "settings")
-    super db, "CREATE TABLE #{table_name}(uid TEXT PRIMARY KEY, value TEXT, ttl INTEGER NOT NULL)"
+    sql = if db.is_a?(MicroSql::PgAdapter)
+      "CREATE TABLE #{table_name}_b(uid TEXT PRIMARY KEY, value BYTEA, ttl INTEGER NOT NULL)"
+    else
+      "CREATE TABLE #{table_name}(uid TEXT PRIMARY KEY, value TEXT, ttl INTEGER NOT NULL)"
+    end
+
+    super db, sql
   end
   
   def [](key)
@@ -46,10 +52,16 @@ class MicroSql::KeyValueTable < MicroSql::Table
   
   def decode(io)
     return unless io
+    return PG::Connection.unescape_bytea(io) if db.is_a?(MicroSql::PgAdapter)
+
     JSON.parse("[#{io}]").first
   end
   
   def encode(value)
-    value && value.to_json
+    return unless value
+    
+    return db.connection.escape_bytea(value.to_s) if db.is_a?(MicroSql::PgAdapter)
+    
+    value.to_json
   end
 end

data/lib/micro_sql/pg_adapter.rb

@@ -15,6 +15,10 @@ class MicroSql::PgAdapter < MicroSql
 
   TRANSACTION_STATUSES = %w(PQTRANS_IDLE PQTRANS_ACTIVE PQTRANS_INTRANS PQTRANS_INERROR PQTRANS_UNKNOWN)
 
+  def connection
+    @impl
+  end
+  
   def transaction_status
     TRANSACTION_STATUSES[@impl.transaction_status]
   end
@@ -137,9 +141,10 @@ class MicroSql::PgAdapter < MicroSql
     
     def nop; end
     
-    def string(s); s; end
+    def string(s);  s; end
     def unknown(s); s; end
     def integer(s); s.to_i; end
+    def bytea(s);   PG::Connection.unescape_bytea(s); end
   end
 
   def conversion_for(ftype, fmod)

data/micro_sql.gemspec

@@ -1,72 +1,46 @@
-# Generated by jeweler
-# DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
-# -*- encoding: utf-8 -*-
+class Gem::Specification
+  class GemfileEvaluator
+    def initialize(scope)
+      @scope = scope
+    end
+    
+    def load_dependencies(path)
+      instance_eval File.read(path) 
+    end
+    
+    def source(*args); end
+    def group(*args); end
+
+    def gem(name, options = {})
+      @scope.add_dependency(name)
+    end
+  end
+  
+  def load_dependencies(file)
+    GemfileEvaluator.new(self).load_dependencies(file)
+  end
+end
+
+Gem::Specification.new do |gem|
+  gem.name          = "micro_sql"
+  gem.authors       = ["radiospiel"]
+  gem.email         = ["eno@open-lab.org"]
+  gem.description   = "You only need a single method to talk to your database..."
+  gem.summary       = gem.description
+  gem.homepage      = "http://github.com/radiospiel/micro_sql"
+  gem.licenses      = ["MIT"]
 
-Gem::Specification.new do |s|
-  s.name = "micro_sql"
-  s.version = "0.3.2"
+  gem.load_dependencies "Gemfile"
+  
+  gem.files         = `git ls-files`.split($\)
+  gem.executables   = gem.files.grep(%r{^bin/}).map{ |f| File.basename(f) }
+  gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
+  gem.require_paths = ["lib"]
+  gem.version       = "0.4.1"
+  gem.date          = Time.now.strftime "%Y-%m-%d" 
 
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = ["radiospiel"]
-  s.date = "2012-04-04"
-  s.description = "You only need a single method to talk to your database..."
-  s.email = "eno@open-lab.org"
-  s.extra_rdoc_files = [
+  gem.extra_rdoc_files = [
     "LICENSE.txt",
     "README.rdoc"
   ]
-  s.files = [
-    ".document",
-    "Gemfile",
-    "Gemfile.lock",
-    "LICENSE.txt",
-    "README.rdoc",
-    "Rakefile",
-    "VERSION",
-    "lib/micro_sql.rb",
-    "lib/micro_sql/key_value_table.rb",
-    "lib/micro_sql/pg_adapter.rb",
-    "lib/micro_sql/sqlite_adapter.rb",
-    "lib/micro_sql/table.rb",
-    "micro_sql.gemspec",
-    "script/watchr",
-    "test/helper.rb",
-    "test/test_micro_sql.rb",
-    "test/test_micro_sql_pg.rb",
-    "test/test_micro_sql_sqlite3.rb"
-  ]
-  s.homepage = "http://github.com/radiospiel/micro_sql"
-  s.licenses = ["MIT"]
-  s.require_paths = ["lib"]
-  s.rubygems_version = "1.8.17"
-  s.summary = "A minimal ruby interface for SQL databases"
-
-  if s.respond_to? :specification_version then
-    s.specification_version = 3
-
-    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<pg>, [">= 0"])
-      s.add_runtime_dependency(%q<sqlite3>, [">= 0"])
-      s.add_development_dependency(%q<bundler>, [">= 0"])
-      s.add_development_dependency(%q<jeweler>, [">= 0"])
-      s.add_development_dependency(%q<simplecov>, [">= 0"])
-      s.add_development_dependency(%q<ruby-debug19>, [">= 0"])
-    else
-      s.add_dependency(%q<pg>, [">= 0"])
-      s.add_dependency(%q<sqlite3>, [">= 0"])
-      s.add_dependency(%q<bundler>, [">= 0"])
-      s.add_dependency(%q<jeweler>, [">= 0"])
-      s.add_dependency(%q<simplecov>, [">= 0"])
-      s.add_dependency(%q<ruby-debug19>, [">= 0"])
-    end
-  else
-    s.add_dependency(%q<pg>, [">= 0"])
-    s.add_dependency(%q<sqlite3>, [">= 0"])
-    s.add_dependency(%q<bundler>, [">= 0"])
-    s.add_dependency(%q<jeweler>, [">= 0"])
-    s.add_dependency(%q<simplecov>, [">= 0"])
-    s.add_dependency(%q<ruby-debug19>, [">= 0"])
-  end
 end
-

data/test/test_micro_sql_pg.rb

@@ -134,14 +134,14 @@ class TestMicroSqlPg < Test::Unit::TestCase
 
   def test_kv_table
     kv = db.key_value_table("kv")
-    assert_equal [ "kv" ], db.tables
+    assert_equal [ "kv_b" ], db.tables
 
     kv["x"] = "y"
-    assert_equal 1, db.ask("SELECT COUNT(*) FROM kv")
+    assert_equal 1, db.ask("SELECT COUNT(*) FROM kv_b")
     assert_equal "y", kv["x"]
 
     kv["x"] = nil
-    assert_equal 0, db.ask("SELECT COUNT(*) FROM kv")
+    assert_equal 0, db.ask("SELECT COUNT(*) FROM kv_b")
     assert_equal nil, kv["x"]
 
     count = 0
@@ -152,4 +152,15 @@ class TestMicroSqlPg < Test::Unit::TestCase
     r = kv.cached "x" do raise "Yo"; "y" end
     assert_equal(r, "y")
   end
+
+
+  def test_kv_table_binary
+    s = (0..255).to_a.pack('c*')
+
+    kv = db.key_value_table("kv")
+
+    kv["bin"] = s
+    assert_equal 1, db.ask("SELECT COUNT(*) FROM kv_b")
+    assert_equal s, kv["bin"]
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: micro_sql
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.4.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-04 00:00:00.000000000 Z
+date: 2013-04-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pg
-  requirement: &70179126169140 !ruby/object:Gem::Requirement
+  requirement: &70229637156100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70179126169140
+  version_requirements: *70229637156100
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &70179126168360 !ruby/object:Gem::Requirement
+  requirement: &70229637155300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,53 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70179126168360
-- !ruby/object:Gem::Dependency
-  name: bundler
-  requirement: &70179126167420 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: *70179126167420
-- !ruby/object:Gem::Dependency
-  name: jeweler
-  requirement: &70179126166660 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: *70179126166660
-- !ruby/object:Gem::Dependency
-  name: simplecov
-  requirement: &70179126165880 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: *70179126165880
-- !ruby/object:Gem::Dependency
-  name: ruby-debug19
-  requirement: &70179126165220 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: *70179126165220
+  version_requirements: *70229637155300
 description: You only need a single method to talk to your database...
-email: eno@open-lab.org
+email:
+- eno@open-lab.org
 executables: []
 extensions: []
 extra_rdoc_files:
@@ -86,6 +43,7 @@ extra_rdoc_files:
 - README.rdoc
 files:
 - .document
+- .gitignore
 - Gemfile
 - Gemfile.lock
 - LICENSE.txt
@@ -118,7 +76,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -4089216543794682112
+      hash: 304612758120307793
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -127,8 +85,12 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.17
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
-summary: A minimal ruby interface for SQL databases
-test_files: []
+summary: You only need a single method to talk to your database...
+test_files:
+- test/helper.rb
+- test/test_micro_sql.rb
+- test/test_micro_sql_pg.rb
+- test/test_micro_sql_sqlite3.rb