rmap 0.3.0 → 0.4.0

data/Gemfile

@@ -7,3 +7,5 @@ gem 'mysql2', "~> 0"
 gem 'json', "~> 1"
 gem 'ripl', "~> 0"
 gem 'ripl-multi_line', "~> 0"
+gem 'powerline', "~> 0"
+gem 'gengin', "~> 0"

data/bin/rmap

@@ -1,18 +1,5 @@
 
 require 'rmap'
-require 'ripl'
-require 'ripl/multi_line'
-
-db = Rmap::Database.new
-
-current = Dir::getwd
-while current != '/'
-  if ::File.file? "#{current}/conf.rmap.rb"
-    db.run("#{current}/conf.rmap.rb")
-    break
-  end
-  current = ::File.expand_path('../',  current)
-end
-
-Ripl.start :binding => db.bindings
+require 'powerline'
 
+Powerline.new Rmap::Commands

data/lib/rmap.rb

@@ -1,10 +1,20 @@
 
-require 'mysql2'
+
+module Rmap
+  current = Dir::getwd
+  while current != '/'
+    if ::File.file? "#{current}/conf.rmap.rb"
+      CONF_ROOT = current
+      break
+    end
+    current = ::File.expand_path('../', current)
+  end
+end
 
 require 'rmap/version'
 require 'rmap/database'
 require 'rmap/table'
 require 'rmap/row'
+require 'rmap/migration'
+require 'rmap/commands'
 
-module Rmap
-end

data/lib/rmap/commands.rb

@@ -0,0 +1,169 @@
+
+require 'ripl'
+require 'ripl/multi_line'
+require 'gengin'
+
+module Rmap
+  module Commands
+    
+    def self.console
+      db = Rmap::Database.new
+      
+      if Rmap.const_defined? :CONF_ROOT
+        db.run("#{Rmap::CONF_ROOT}/conf.rmap.rb")
+      end
+
+      Ripl.start :binding => db.bindings
+    end
+    
+    def self.current_migration(options)
+      if !db.table? :rmap_vars
+        db.create :rmap_vars
+        db.rmap_vars.add :key, :string
+        db.rmap_vars.add :value, :binary
+      end
+      
+      if db.rmap_vars.key_eq(:current_migration).count == 0
+        db.rmap_vars.insert(:key => :current_migration, :value => 0)
+        current_migration = 0
+      else
+        current_migration = db.rmap_vars.key_eq(:current_migration).first.value.to_i
+      end
+      
+      if options[:echo] != false
+        puts current_migration
+      end
+      
+      current_migration
+    end
+    
+    module Generate
+      
+      def self.conf(database, options={})
+        Gengin.new do
+          source_root File.expand_path("../generator_templates/", __FILE__)
+          @database = database
+          copy "conf.rmap.rb", :erb => true
+        end
+      end
+      
+      def self.migration(name, *columns, options)
+        if !Rmap.const_defined? :CONF_ROOT
+          raise "Could not find a conf.rmap.rb file in your path."
+        end
+        
+        Gengin.new do
+          source_root File.expand_path("../generator_templates/", __FILE__)
+          destination_root "#{Rmap::CONF_ROOT}/migrations"
+          @name = name
+          @columns = columns
+          
+          up_code_buf = []
+          down_code_buf = []
+          
+          if name.match(/\Aadd_.*_to_(.*?)\Z/)
+            table_name = $1
+            @columns.each do |column|
+              (column_name, type) = column.split(/:/)
+              up_code_buf << "  #{table_name}.add :#{column_name}, :#{type}"
+              down_code_buf << "  #{table_name}.remove :#{column_name}"
+            end
+          end
+          
+          if name.match(/\Aremove_.*_from_(.*?)\Z/)
+            table_name = $1
+            @columns.each do |column|
+              (column_name, type) = column.split(/:/)
+              up_code_buf << "  #{table_name}.remove :#{column_name}"
+              down_code_buf << "  #{table_name}.add :#{column_name}, :#{type}"
+            end
+          end
+          
+          @up_code = up_code_buf.join("\n")
+          @down_code = down_code_buf.join("\n")
+          
+          copy "migration.rmap.rb", "#{Time.new.to_i}_#{name.downcase.strip.gsub(/\W+/, "_")}.migration.rmap.rb", :erb => true
+          
+        end
+        
+      end
+      
+    end
+
+    
+    def self.migrate(options = {})
+      db = Rmap::Commands::db
+      
+      current_migration = Rmap::Commands::current_migration(:echo => false)
+      
+      migrations = Dir.new("#{Rmap::CONF_ROOT}/migrations/").to_a.find_all{|file| ::File.file? "#{Rmap::CONF_ROOT}/migrations/#{file}" }.map{ |file| Rmap::Migration.new("#{Rmap::CONF_ROOT}/migrations/#{file}") }.sort {|l,r| l.schema_version <=> r.schema_version}
+      
+      if !options[:to].nil?
+        to = options[:to].to_i
+        found = false
+        migrations.each do |migration|
+          if migration.schema_version == to
+            found = true
+            break
+          end
+        end
+        
+        if !found
+          raise "No such migration '#{to}' exists"
+        end
+        
+        if to > current_migration
+          migrations.each do |migration|
+            if migration.schema_version <= current_migration
+              next
+            end
+            
+            if migration.schema_version <= to
+              puts "up: #{migration.schema_version}"
+              db.run &migration.up_block
+            else
+              break
+            end
+          end
+          db.rmap_vars.key_eq(:current_migration).value = to.to_s
+        elsif to < current_migration
+          migrations.reverse.each do |migration|
+            if migration.schema_version > current_migration
+              next
+            end
+            if migration.schema_version > to
+              puts "down: #{migration.schema_version}"
+              db.run &migration.down_block
+            else
+              break
+            end
+          end
+          db.rmap_vars.key_eq(:current_migration).value = to
+        else
+          raise "already at migration #{to}"
+        end
+        
+      elsif migrations.count > 0
+        migrations.each do |migration|
+          if migration.schema_version > current_migration
+            puts "up: #{migration.schema_version}"
+            db.run &migration.up_block
+          end
+        end
+        db.rmap_vars.key_eq(:current_migration).value = migrations.last.schema_version
+      end
+           
+    end
+  
+  private
+    
+  def self.db
+    db = Rmap::Database.new
+    if Rmap.const_defined? :CONF_ROOT
+      db.run("#{Rmap::CONF_ROOT}/conf.rmap.rb")
+    end
+    db
+  end
+  
+  end
+end

data/lib/rmap/database.rb

@@ -1,43 +1,35 @@
 
+require 'mysql2'
+
 module Rmap
   class Database
     
-    def initialize(conf={:username => 'root'}, &block)
-      @conf = conf
+    def initialize(connection={}, &block)
+      self.connection = connection
       if !block.nil?
         instance_eval(&block)
       end
+      @scopes = {}
+    end
+    
+    def connection=(connection)
+      @connection = {:host => "localhost", :username => "root", :password => ""}.merge connection
+      close
+      @table_names = nil
     end
     
     def client
       if @client.nil?
-        @client = Mysql2::Client.new(@conf)
+        @client = Mysql2::Client.new(@connection)
       end
       @client
     end
     
-    def host(host)
-      @client = nil
-      @table_names = nil
-      @conf[:host] = host
-    end
-    
-    def username(username)
-      @client = nil
-      @table_names = nil
-      @conf[:username] = username
-    end
-    
-    def password(password)
-      @client = nil
-      @table_names = nil
-      @conf[:password] = password
-    end
-    
-    def database(database)
+    def close
+      if !@client.nil?
+        @client.close
+      end
       @client = nil
-      @table_names = nil
-      @conf[:database] = database
     end
     
     def bindings
@@ -58,16 +50,12 @@ module Rmap
     end
     
     def method_missing name, *args
-      if table_names.include? name.to_s
-        Table.new(self, name)
-      else
-        super(name, *args)
-      end
+      Table.new(self, name)
     end
     
     def create(name)
       @table_names = nil
-      client.query("create table `#{name}`(id int unsigned not null auto_increment primary key)")
+      client.query("create table `#{name}`(id int unsigned not null auto_increment primary key) engine = InnoDB")
     end
     
     def table_names
@@ -77,5 +65,17 @@ module Rmap
       @table_names
     end
     
+    def start_transaction
+      client.query("start transaction")
+    end
+    
+    def commit_transaction
+      client.query("commit")
+    end
+    
+    def rollback_transaction
+      client.query("rollback")
+    end
+    
   end
 end

data/lib/rmap/generator_templates/conf.rmap.rb

@@ -0,0 +1,5 @@
+
+#host "localhost"
+#username "root"
+#password ""
+database "<%= @database %>"

data/lib/rmap/generator_templates/migration.rmap.rb

@@ -0,0 +1,8 @@
+
+up do
+<%= @up_code %>
+end
+
+down do
+<%= @down_code %>
+end

data/lib/rmap/migration.rb

@@ -0,0 +1,21 @@
+
+module Rmap
+  class Migration
+    
+    attr_accessor :schema_version, :up_block, :down_block
+    
+    def initialize(file_path)
+      @schema_version = file_path.sub(/\A.*?(\d+)[^\/]*\Z/, "\\1").to_i
+      instance_eval(::File.open(file_path).read, file_path)
+    end
+    
+    def up(&block)
+      @up_block = block
+    end
+    
+    def down(&block)
+      @down_block = block
+    end
+    
+  end
+end

data/lib/rmap/row.rb

@@ -17,7 +17,7 @@ module Rmap
     end
     
     def update(hash)
-      @database.client.query("update `#{@table_name}` set #{(hash.map{|k,v| "`#{k}`='#{@database.client.escape(v)}'"}).join(', ')} where id = '#{id}'")
+      @database.client.query("update `#{@table_name}` set #{(hash.map{|k,v| "`#{k}`='#{@database.client.escape(v.to_s)}'"}).join(', ')} where id = '#{id}'")
     end
     
     def delete
@@ -36,8 +36,12 @@ module Rmap
       end
     end
     
+    def to_hash
+      @database.client.query("select * from `#{@table_name}` where id = '#{id}'", :as => :hash).first
+    end
+    
     def to_s
-      @database.client.query("select * from `#{@table_name}` where id = '#{id}'", :as => :hash).first.to_json
+      to_hash.to_json
     end
     
   end

data/lib/rmap/table.rb

@@ -9,8 +9,8 @@ module Rmap
       'le' => lambda {|left,right| "#{left} <= #{right}"}, 
       'ge' => lambda {|left,right| "#{left} >= #{right}"}, 
       'contains' => lambda {|left,right| "#{left} like concat('%', #{right}, '%')"}, 
-      'begins_with' => lambda {|left,right| "#{left} like concat('%', #{right})"}, 
-      'ends_with' => lambda {|left,right| "#{left} like concat(#{right}, '%')"},
+      'ends_with' => lambda {|left,right| "#{left} like concat('%', #{right})"}, 
+      'begins_with' => lambda {|left,right| "#{left} like concat(#{right}, '%')"},
       'year_eq' => lambda {|left,right| "year(#{left}) = #{right}"},
       'year_ne' => lambda {|left,right| "year(#{left}) != #{right}"}, 
       'year_lt' => lambda {|left,right| "year(#{left}) < #{right}"}, 
@@ -82,6 +82,7 @@ module Rmap
     end
     
     def method_missing name, *args
+      table = self
       if @database.table? name
         Table.new(@database, name).join(self, *args)
       elsif column? name
@@ -91,6 +92,9 @@ module Rmap
       elsif name.match /\A(.*?)_(#{BINARY_FILTER_METHODS.keys.join('|')})\Z/
         @binary_filter_methods_args[$2].push([$1.split(/_or_/),args[0]])
         self
+      elsif @database.instance_eval{!@scopes[table.name].nil? && !@scopes[table.name][name].nil?}
+        instance_exec *args, &@database.instance_eval{@scopes[table.name][name]}
+        self
       else
         super
       end
@@ -172,7 +176,7 @@ module Rmap
         end
       else
         if table2.column? "#{to_singular(table1.name)}_id"
-          "#{table1.name}.id = #{to_singular(table2.name)}.#{table1.name}_id"
+          "#{table1.name}.id = #{table2.name}.#{to_singular(table1.name)}_id"
         else
           "#{table1.name}.#{to_singular(table2.name)}_id = #{table2.name}.id"
         end
@@ -237,22 +241,38 @@ module Rmap
       out
     end
     
-    def generate_select_sql(expression_list_sql, limit = nil)
-      if !limit.nil?
-        limit_sql = "limit #{limit}"
+    def generate_limit_sql
+      if !@limit_row_count.nil?
+        "limit #{@limit_offset}, #{@limit_row_count}"
       else 
-        limit_sql = ''
+        ""
       end
-      "select #{format_sql(expression_list_sql)} #{generate_from_sql} #{generate_where_sql} #{generate_group_by_sql} #{generate_order_by_sql} #{limit_sql}"
     end
     
-    def count(limit = nil)
-      @database.client.query(generate_select_sql('id', limit)).count
+    def generate_select_sql(expression_list_sql, without_limit_sql = false)
+      "select #{format_sql(expression_list_sql)} #{generate_from_sql} #{generate_where_sql} #{generate_group_by_sql} #{generate_order_by_sql} #{without_limit_sql ? "" : generate_limit_sql}"
+    end
+    
+    def explain
+      generate_select_sql('id').strip
+    end
+    
+    def count
+      @database.client.query(generate_select_sql('id')).count
+    end
+    
+    def page_count
+      count_without_limit = @database.client.query(generate_select_sql('id', true)).count
+      if count_without_limit  > 0
+        @page_size.nil? ? 1 : (count_with_limit.to_f / @page_size).ceil
+      else
+        0
+      end
     end
     
-    def all(limit = nil)
+    def all
       out = []
-      @database.client.query(generate_select_sql('id', limit), :as => :hash).each do |row|
+      @database.client.query(generate_select_sql('id'), :as => :hash).each do |row|
         out.push(Row.new(@database, @name, row['id']))
       end
       out
@@ -264,7 +284,7 @@ module Rmap
     end
     
     def first
-      all(1).first
+      all.first
     end
     
     def update(hash)
@@ -277,11 +297,12 @@ module Rmap
     
     def insert(hash)
       @database.client.query("insert into `#{@name}`(#{(hash.map{|k,v| "`#{k}`"}).join(', ')}) values(#{(hash.map{|k,v| quote(v)}).join(', ')})")
+      @database.client.last_id
     end
     
-    def sum(sql_expression, limit = nil)
+    def sum(sql_expression)
       out = 0
-      @database.client.query(generate_select_sql("sum(#{sql_expression})", limit), :as => :array).each{|row| out += row.first}
+      @database.client.query(generate_select_sql("sum(#{sql_expression})"), :as => :array).each{|row| out += row.first}
       out
     end
     
@@ -291,6 +312,11 @@ module Rmap
     end
     
     def add(name, type, options = {})
+      
+      if !@database.table? @name
+        @database.create @name
+      end
+    
       case type
       when :string
         @database.client.query("alter table `#{@name}` add `#{name}` varchar(255) not null")
@@ -326,6 +352,22 @@ module Rmap
       all.to_s
     end
     
+    def define_scope(name, &block)
+      table = self
+      @database.instance_eval do
+        if @scopes[table.name].nil?
+          @scopes[table.name] = {}
+        end
+        @scopes[table.name][name.to_sym] = block
+      end
+    end
+    
+    def paginate(page, page_size = 10)
+      @limit_row_count = page_size
+      @limit_offset = (page - 1) * page_size
+      self
+    end
+    
     private
     
     def to_singular(value)

data/lib/rmap/version.rb

@@ -1,3 +1,3 @@
 module Rmap
-  VERSION = "0.3.0"
+  VERSION = "0.4.0"
 end

data/rmap.gemspec

@@ -21,5 +21,7 @@ Gem::Specification.new do |s|
   s.add_dependency "json", "~> 1"
   s.add_dependency "ripl", "~> 0"
   s.add_dependency "ripl-multi_line", "~> 0"
+  s.add_dependency "powerline", "~> 0"
+  s.add_dependency "gengin", "~> 0"
   
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rmap
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-14 00:00:00.000000000Z
+date: 2012-08-16 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mysql2
-  requirement: &82061450 !ruby/object:Gem::Requirement
+  requirement: &83687640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *82061450
+  version_requirements: *83687640
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &82061200 !ruby/object:Gem::Requirement
+  requirement: &83684760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: '1'
   type: :runtime
   prerelease: false
-  version_requirements: *82061200
+  version_requirements: *83684760
 - !ruby/object:Gem::Dependency
   name: ripl
-  requirement: &82060970 !ruby/object:Gem::Requirement
+  requirement: &83684030 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *82060970
+  version_requirements: *83684030
 - !ruby/object:Gem::Dependency
   name: ripl-multi_line
-  requirement: &82060740 !ruby/object:Gem::Requirement
+  requirement: &83683360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,7 +54,29 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *82060740
+  version_requirements: *83683360
+- !ruby/object:Gem::Dependency
+  name: powerline
+  requirement: &83682550 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: *83682550
+- !ruby/object:Gem::Dependency
+  name: gengin
+  requirement: &83681920 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: *83681920
 description: 
 email:
 - jody@jodysalt.com
@@ -69,7 +91,11 @@ files:
 - Rakefile
 - bin/rmap
 - lib/rmap.rb
+- lib/rmap/commands.rb
 - lib/rmap/database.rb
+- lib/rmap/generator_templates/conf.rmap.rb
+- lib/rmap/generator_templates/migration.rmap.rb
+- lib/rmap/migration.rb
 - lib/rmap/row.rb
 - lib/rmap/table.rb
 - lib/rmap/version.rb