rmap 0.4.0 → 0.5.0

data/features/conf.testbed.rb

@@ -0,0 +1,25 @@
+
+load  File.expand_path("../../rmap.gemspec", __FILE__)
+
+require 'rmap'
+
+create do
+  if ::Rmap::Database::exists?('rmap_test')
+    ::Rmap::Database::drop('rmap_test')
+  end
+  ::Rmap::Database::create('rmap_test')
+end
+
+set_up do
+  posts.add :title, :string
+  posts.add :body, :text
+  
+  (1..10).each do |i|
+    posts.insert({:title  => "Test title #{i}", :body => "Test body #{i}"})
+  end
+  
+end
+
+tear_down do
+  ::Rmap::Database::drop('rmap_test')
+end

data/features/find.test.testbed.rb

@@ -0,0 +1,14 @@
+
+posts.should_be_kind_of ::Rmap::Table
+
+posts.should_have_method :find
+
+posts.find(1).should_be_kind_of ::Rmap::Row
+
+posts.find(1).id.should_equal(1)
+
+posts.find(3423434).should_equal(nil)
+
+row = posts.find(:title => "Test title 5")
+
+row.id.should_equal(5)

data/features/find_by.test.testbed.rb

@@ -0,0 +1,10 @@
+
+posts.should_be_kind_of ::Rmap::Table
+
+row = posts.find_by_title("Test title 3")
+
+row.should_be_kind_of ::Rmap::Row
+
+row.id.should_equal(3)
+
+posts.find_by_title("Test title 3 asdda").should_equal(nil)

data/features/table.test.testbed.rb

@@ -0,0 +1,8 @@
+
+table('posts').should_be_kind_of ::Rmap::Table
+
+table(:posts).should_be_kind_of ::Rmap::Table
+
+table('posts').name.should_equal('posts')
+
+table(:posts).name.should_equal('posts')

data/lib/rmap/commands.rb

@@ -16,25 +16,8 @@ module Rmap
       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
+    def self.current_migration
+      puts db.current_migration
     end
     
     module Generate
@@ -90,80 +73,21 @@ module Rmap
       
     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
-           
+      db = self.db
+      db.migrate(options)
+      puts "At migration: #{db.current_migration}"
     end
   
-  private
-    
-  def self.db
-    db = Rmap::Database.new
-    if Rmap.const_defined? :CONF_ROOT
-      db.run("#{Rmap::CONF_ROOT}/conf.rmap.rb")
+    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
-    db
-  end
   
   end
 end

data/lib/rmap/database.rb

@@ -3,6 +3,27 @@ require 'mysql2'
 
 module Rmap
   class Database
+  
+    def self.create(database, connection = {})
+      connection = {:host => "localhost", :username => "root", :password => ""}.merge connection
+      Mysql2::Client.new(connection).query("create database `#{database}`");
+      connection[:database] = database
+      self.new(connection)
+    end
+    
+    def self.drop(database, connection = {})
+      connection = {:host => "localhost", :username => "root", :password => ""}.merge connection
+      Mysql2::Client.new(connection).query("drop database `#{database}`");
+    end
+    
+    def self.list(connection = {})
+      connection = {:host => "localhost", :username => "root", :password => ""}.merge connection
+      Mysql2::Client.new(connection).query("show databases", :as => :array).map{|a| a[0]}
+    end
+    
+    def self.exists?(database, connection = {})
+      list(connection).include? database.to_s
+    end
     
     def initialize(connection={}, &block)
       self.connection = connection
@@ -49,8 +70,12 @@ module Rmap
       table_names.include?(name.to_s)
     end
     
+    def table(name)
+      Table.new(self, name.to_s)
+    end
+    
     def method_missing name, *args
-      Table.new(self, name)
+      table(name)
     end
     
     def create(name)
@@ -77,5 +102,112 @@ module Rmap
       client.query("rollback")
     end
     
+    def current_migration
+      if !table? :rmap_vars
+        rmap_vars.add :key, :string
+        rmap_vars.add :value, :binary
+      end
+      
+      if rmap_vars.key_eq(:current_migration).count == 0
+        rmap_vars.insert(:key => :current_migration, :value => 0)
+        0
+      else
+        rmap_vars.key_eq(:current_migration).first.value.to_i
+      end
+    end
+    
+    def migrate(options = {})
+      migrations_dir = !options[:migrations_dir].nil? ? (options[:migrations_dir].match(/\/\Z/) ? options[:migrations_dir] : "#{options[:migrations_dir]}/") : "#{Rmap::CONF_ROOT}/migrations/"
+      
+      current_migration = self.current_migration
+      
+      migrations = Dir.new(migrations_dir).to_a.find_all{|file| ::File.file? "#{migrations_dir}#{file}" }.map{ |file| Rmap::Migration.new("#{migrations_dir}#{file}") }.sort {|l,r| l.schema_version <=> r.schema_version}
+      
+      if migrations.count == 0
+        raise "There are currently no migrations."
+      end
+      
+      if options[:to].nil?
+        to = migrations.last.schema_version
+        if to == current_migration
+          raise "There are no are more migrations that can be applied."
+        end
+      elsif options[:to].to_s == 'previous'
+        if current_migration == 0
+          raise "No migrations have been applied."
+        elsif current_migration == migrations.first.schema_version
+          to = 0
+        else
+          migrations.each_with_index do |migration, i|
+            if current_migration == migration.schema_version
+              to = migrations[i - 1]
+              break
+            end
+          end
+        end
+      elsif options[:to].to_s == 'next'
+        if current_migration == 0
+          to = migrations.first.schema_version
+        elsif current_migration == migrations.last.schema_version
+          raise "There are no are more migrations that can be applied."
+        end
+        migrations.each_with_index do |migration, i|
+          if current_migration == migration.schema_version
+            to = migrations[i + 1]
+            break
+          end
+        end
+      else
+        found = false
+        to = options[:to].to_i
+        
+        if to == current_migration
+          raise "Already at migration #{to}"
+        end
+        
+        if to != 0
+          migrations.each do |migration, i|
+            if migration.schema_version == to
+              found = true
+              break
+            end
+          end
+          
+          if !found
+            raise "No such migration '#{to}' exists"
+          end
+        end
+      end
+      
+      if to > current_migration
+        migrations.each do |migration|
+          if migration.schema_version <= current_migration
+            next
+          end
+          
+          if migration.schema_version <= to
+            run &migration.up_block
+          else
+            break
+          end
+        end
+      else
+        migrations.reverse.each do |migration|
+          if migration.schema_version > current_migration
+            next
+          end
+          if migration.schema_version > to
+            run &migration.down_block
+          else
+            break
+          end
+        end
+      end
+      
+      rmap_vars.key_eq(:current_migration).value = to
+      
+      self
+    end
+    
   end
 end

data/lib/rmap/table.rb

@@ -49,7 +49,7 @@ module Rmap
       'second_ge' => lambda {|left,right| "second(#{left}) >= #{right}"},
     }
     
-    attr_accessor :name
+    attr_accessor :name, :page
     
     def initialize(database, name)
       @database = database
@@ -58,6 +58,7 @@ module Rmap
       Table::BINARY_FILTER_METHODS.each {|name, block| @binary_filter_methods_args[name] = []}
       @join_list = []
       @order_by_list = []
+      @page = 1
     end
   
     Table::BINARY_FILTER_METHODS.each do |name,block|
@@ -89,6 +90,8 @@ module Rmap
         all.map{|row| row.fetch(name).first}
       elsif column?(name.to_s.sub(/=\Z/, "")) && name.match(/\A(.*)=\Z/)
         all.each{|row| row.update($1 => args[0])}
+      elsif name.match /\Afind_by_(.*)\Z/
+        eq($1, args[0]).first
       elsif name.match /\A(.*?)_(#{BINARY_FILTER_METHODS.keys.join('|')})\Z/
         @binary_filter_methods_args[$2].push([$1.split(/_or_/),args[0]])
         self
@@ -242,15 +245,11 @@ module Rmap
     end
     
     def generate_limit_sql
-      if !@limit_row_count.nil?
-        "limit #{@limit_offset}, #{@limit_row_count}"
-      else 
-        ""
-      end
+      @page_size.nil? ? "" : "limit #{(@page - 1) * @page_size}, #{@page_size}"
     end
     
-    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}"
+    def generate_select_sql(expression_list_sql, without_limit = false)
+      "select #{format_sql(expression_list_sql)} #{generate_from_sql} #{generate_where_sql} #{generate_group_by_sql} #{generate_order_by_sql} #{without_limit ? "" : generate_limit_sql}"
     end
     
     def explain
@@ -261,15 +260,6 @@ module Rmap
       @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
       out = []
       @database.client.query(generate_select_sql('id'), :as => :hash).each do |row|
@@ -300,9 +290,9 @@ module Rmap
       @database.client.last_id
     end
     
-    def sum(sql_expression)
+    def sum(sql_expression, limit = nil)
       out = 0
-      @database.client.query(generate_select_sql("sum(#{sql_expression})"), :as => :array).each{|row| out += row.first}
+      @database.client.query(generate_select_sql("sum(#{sql_expression})", limit), :as => :array).each{|row| out += row.first}
       out
     end
     
@@ -328,7 +318,6 @@ module Rmap
         @database.client.query("alter table `#{@name}` add `#{name}` int signed not null")
       when :foreign_key
         @database.client.query("alter table `#{@name}` add `#{name}` int unsigned not null")
-        @database.client.query("alter table `#{@name}` add index(`#{name}`)")
       when :date
         @database.client.query("alter table `#{@name}` add `#{name}` date not null")
       when :datetime
@@ -338,6 +327,11 @@ module Rmap
       when :decimal
         @database.client.query("alter table `#{@name}` add `#{name}` decimal not null")
       end
+      
+      if type == :foreign_key || options[:index] == true
+        @database.client.query("alter table `#{@name}` add index(`#{name}`)")
+      end
+      
     end
     
     def remove(name)
@@ -362,12 +356,36 @@ module Rmap
       end
     end
     
-    def paginate(page, page_size = 10)
-      @limit_row_count = page_size
-      @limit_offset = (page - 1) * page_size
+    def paginate(page_size = 10)
+      @page_size = page_size
+      self
+    end
+    
+    def set_page(page)
+      @page = page.to_i
       self
     end
     
+    def page_count
+      count_without_limit = @database.client.query(generate_select_sql('id', true)).count
+      if !@page_size.nil?
+        (count_without_limit.to_f / @page_size).ceil
+      else
+        count_without_limit > 0 ? 1 : 0
+      end
+    end
+    
+    def find(arg1)
+      if arg1.respond_to? :to_hash
+        arg1.to_hash.each do |k,v|
+          self.eq(k, v)
+        end
+      else
+        self.id_eq(arg1)
+      end
+      first
+    end
+    
     private
     
     def to_singular(value)

data/lib/rmap/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rmap
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.5.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-16 00:00:00.000000000Z
+date: 2012-10-03 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mysql2
-  requirement: &83687640 !ruby/object:Gem::Requirement
+  requirement: &76407690 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *83687640
+  version_requirements: *76407690
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &83684760 !ruby/object:Gem::Requirement
+  requirement: &76505030 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: '1'
   type: :runtime
   prerelease: false
-  version_requirements: *83684760
+  version_requirements: *76505030
 - !ruby/object:Gem::Dependency
   name: ripl
-  requirement: &83684030 !ruby/object:Gem::Requirement
+  requirement: &76562470 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *83684030
+  version_requirements: *76562470
 - !ruby/object:Gem::Dependency
   name: ripl-multi_line
-  requirement: &83683360 !ruby/object:Gem::Requirement
+  requirement: &76625460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *83683360
+  version_requirements: *76625460
 - !ruby/object:Gem::Dependency
   name: powerline
-  requirement: &83682550 !ruby/object:Gem::Requirement
+  requirement: &76720530 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *83682550
+  version_requirements: *76720530
 - !ruby/object:Gem::Dependency
   name: gengin
-  requirement: &83681920 !ruby/object:Gem::Requirement
+  requirement: &76819340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -76,7 +76,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *83681920
+  version_requirements: *76819340
 description: 
 email:
 - jody@jodysalt.com
@@ -90,6 +90,10 @@ files:
 - README.markdown
 - Rakefile
 - bin/rmap
+- features/conf.testbed.rb
+- features/find.test.testbed.rb
+- features/find_by.test.testbed.rb
+- features/table.test.testbed.rb
 - lib/rmap.rb
 - lib/rmap/commands.rb
 - lib/rmap/database.rb