cramp 0.10 → 0.11

data/lib/cramp.rb

@@ -5,9 +5,14 @@ require 'active_support'
 require 'active_support/core_ext/class/inheritable_attributes'
 require 'active_support/core_ext/class/attribute_accessors'
 require 'active_support/core_ext/module/aliasing'
+require 'active_support/core_ext/module/attribute_accessors'
 require 'active_support/core_ext/kernel/reporting'
 require 'active_support/concern'
+require 'active_support/core_ext/hash/indifferent_access'
+require 'active_support/buffered_logger'
 
 module Cramp
-  VERSION = '0.10'
+  VERSION = '0.11'
+
+  mattr_accessor :logger
 end

data/lib/cramp/controller/abstract.rb

@@ -1,3 +1,5 @@
+require 'active_support/core_ext/hash/keys'
+
 module Cramp
   module Controller
     class Abstract
@@ -61,7 +63,7 @@ module Cramp
       end
 
       def params
-        @params ||= @env['usher.params']
+        @params ||= request.params.update(@env['usher.params']).symbolize_keys
       end
 
     end

data/lib/cramp/controller/websocket.rb

@@ -21,9 +21,11 @@ module Cramp
     end
 
     class Websocket < Abstract
-
       include PeriodicTimer
 
+      # TODO : Websockets shouldn't need this in an ideal world
+      include KeepConnectionAlive
+
       class_inheritable_accessor :on_data_callbacks, :instance_reader => false
       self.on_data_callbacks = []
 
@@ -48,13 +50,14 @@ module Cramp
       end
 
       def _on_data_receive(data)
-        data = data.slice(/\000([^\377]*)\377/).gsub(/^\x00|\xff$/, '')
-
+        data = data.split(/\000([^\377]*)\377/).select{|d| !d.empty? }.collect{|d| d.gsub(/^\x00|\xff$/, '') }
         self.class.on_data_callbacks.each do |callback|
-          EM.next_tick { send(callback, data) }
+          data.each do |message|
+            EM.next_tick { send(callback, message) }
+          end
         end
       end
-
+      
     end
   end
 end

data/lib/cramp/model.rb

@@ -21,6 +21,7 @@ module Cramp
     autoload :Attribute, "cramp/model/attribute"
     autoload :AttributeMethods, "cramp/model/attribute_methods"
     autoload :Status, "cramp/model/status"
+    autoload :Callbacks, "cramp/model/callbacks"
 
     def self.init(settings)
       Arel::Table.engine = Cramp::Model::Engine.new(settings)

data/lib/cramp/model/arel_monkey_patches.rb

@@ -17,7 +17,7 @@ class Arel::Session
 
 end
 
-class Arel::Relation
+module Arel::Relation
   def call(&block)
     engine.read(self, &block)
   end

data/lib/cramp/model/attribute_methods.rb

@@ -42,7 +42,10 @@ module Cramp
         if ma = self.class.model_attributes[name.to_sym]
           value = ma.check_value!(value)
         end
-        @attributes[name] = value
+        if(@attributes[name] != value)
+          send "#{name}_will_change!".to_sym
+          @attributes[name] = value
+        end
       end
 
       def read_attribute(name)

data/lib/cramp/model/base.rb

@@ -5,6 +5,8 @@ module Cramp
       extend Finders
       include AttributeMethods
       include ActiveModel::Validations
+      include ActiveModel::Dirty
+      include Callbacks
 
       class << self
         def columns
@@ -48,6 +50,16 @@ module Cramp
         end
       end
 
+      def destroy(callback = nil, &block)
+        callback ||= block
+        
+        relation.delete do
+          status = Status.new(self, true)
+          after_destroy_callbacks status
+          callback.arity == 1 ? callback.call(status) : callback.call if callback
+        end
+      end
+
       private
 
       def create_record(callback = nil, &block)
@@ -62,18 +74,33 @@ module Cramp
             saved = false
           end
 
-          callback.arity == 1 ? callback.call(Status.new(self, saved)) : callback.call if callback
+          status = Status.new(self, saved)
+          after_save status
+          callback.arity == 1 ? callback.call(status) : callback.call if callback
         end
       end
 
       def update_record(callback = nil, &block)
         callback ||= block
 
-        relation = self.class.arel_table.where(self.class[self.class.primary_key].eq(send(self.class.primary_key)))
-
         relation.update(arel_attributes) do |updated_rows|
-          callback.arity == 1 ? callback.call(updated_rows) : callback.call if callback
+          status = Status.new(self, true)
+          after_save status
+          callback.arity == 1 ? callback.call(status) : callback.call if callback
+        end
+      end
+
+      def relation
+        self.class.arel_table.where(self.class[self.class.primary_key].eq(send(self.class.primary_key)))
+      end
+
+      def after_save(status)
+        if status.success?
+          @previously_changed = changes
+          changed_attributes.clear
         end
+        
+        after_save_callbacks status
       end
 
       def arel_attributes(exclude_primary_key = true, attribute_names = @attributes.keys)

data/lib/cramp/model/callbacks.rb

@@ -0,0 +1,41 @@
+module Cramp
+  module Model
+    module Callbacks
+      extend ActiveSupport::Concern
+      
+      included do
+        class_inheritable_accessor :after_save_callback_names
+        class_inheritable_accessor :after_destroy_callback_names
+        
+        self.after_save_callback_names = []
+        self.after_destroy_callback_names = []
+      end
+      
+      module ClassMethods
+        def after_save(*method_names)
+          self.after_save_callback_names += method_names
+        end
+        
+        def after_destroy(*method_names)
+          self.after_destroy_callback_names += method_names
+        end
+      end
+      
+      private
+      def after_save_callbacks(result)
+        after_save_callback_names.collect do |callback_name|
+          callback = method callback_name
+          callback.arity == 1 ? callback.call(result) : callback.call if callback
+        end
+      end
+      
+      def after_destroy_callbacks(result)
+        after_destroy_callback_names.collect do |callback_name|
+          callback = method callback_name
+          callback.arity == 1 ? callback.call(result) : callback.call if callback
+        end
+      end
+      
+    end
+  end
+end

data/lib/cramp/model/engine.rb

@@ -1,45 +1,75 @@
+require 'active_support/core_ext/module/attribute_accessors'
+
 module Cramp
   module Model
     class Engine
+      autoload :Connection, "cramp/model/engine/connection"
+      
       include Quoting
 
       def initialize(settings)
-        @settings = settings
+        @connection = Connection.new settings
         @quoted_column_names, @quoted_table_names = {}, {}
-
-        EventedMysql.settings.update(settings)
       end
 
       def create(relation, &block)
-        EventedMysql.insert(relation.to_sql) {|rows| yield(rows) if block_given? }
+        query = relation.to_sql
+        log_query(query)
+        @connection.insert(query) {|rows| yield(rows) if block_given? }
       end
 
       def read(relation, &block)
-        EventedMysql.select(relation.to_sql) {|rows| yield(rows) }
+        query = relation.to_sql
+        log_query(query)
+        @connection.select(query) {|rows| yield(rows) }
       end
 
       def update(relation)
-        EventedMysql.update(relation.to_sql) {|rows| yield(rows) if block_given? }
+        query = relation.to_sql
+        log_query(query)
+        @connection.update(query) {|rows| yield(rows) if block_given? }
       end
 
       def delete(relation)
-        EventedMysql.delete(relation.to_sql) {|rows| yield(rows) if block_given? }
+        query = relation.to_sql
+        log_query(query)
+        @connection.delete(relation.to_sql) {|rows| yield(rows) if block_given? }
       end
 
       def adapter_name
-        "Cramp MySQL Async Adapter"
+        "mysql"
+      end
+      
+      def connection
+        # Arel apparently uses this method to check whether the engine is connected or not
+        @connection
+      end
+      
+      def tables
+        sql = "SHOW TABLES"
+        tables = []
+        result = @connection.execute_now(sql)
+
+        result.each { |field| tables << field[0] }
+        result.free
+        tables
       end
 
       def columns(table_name, name = nil)
         sql = "SHOW FIELDS FROM #{quote_table_name(table_name)}"
         columns = []
-        result = EventedMysql.execute_now(sql)
+        result = @connection.execute_now(sql)
 
         result.each { |field| columns << Column.new(field[0], field[4], field[1], field[2] == "YES") }
         result.free
         columns
       end
 
+      protected
+
+      def log_query(sql)
+        Cramp.logger.info("[QUERY] #{sql}") if Cramp.logger
+      end
     end
   end
 end

data/lib/cramp/model/engine/connection.rb

@@ -0,0 +1,32 @@
+module Cramp
+  module Model
+    class Engine
+      class Connection
+        def initialize(settings)
+          EventedMysql.settings.update(settings)
+        end
+        
+        def execute_now(sql)
+          EventedMysql.execute_now sql
+        end
+        
+        def insert(sql, &block)
+          EventedMysql.insert sql, block
+        end
+        
+        def select(sql, &block)
+          EventedMysql.select sql, block
+        end
+        
+        def update(sql, &block)
+          EventedMysql.update sql, block
+        end
+        
+        def delete(sql, &block)
+          EventedMysql.delete sql, block
+        end
+        
+      end
+    end
+  end
+end

data/lib/cramp/model/finders.rb

@@ -19,7 +19,7 @@ module Cramp
       private
 
       def table_name
-        @table_name || self.to_s.pluralize
+        self.to_s.demodulize.underscore.pluralize
       end
 
     end

data/lib/cramp/model/quoting.rb

@@ -79,16 +79,6 @@ module Cramp
         s.gsub(/\\/, '\&\&').gsub(/'/, "''") # ' (for ruby-mode)
       end
 
-      # Quotes the column name. Defaults to no quoting.
-      def quote_column_name(column_name)
-        column_name
-      end
-
-      # Quotes the table name. Defaults to column name quoting.
-      def quote_table_name(table_name)
-        quote_column_name(table_name)
-      end
-
       def quoted_true
         "'t'"
       end

metadata

@@ -1,7 +1,11 @@
 --- !ruby/object:Gem::Specification 
 name: cramp
 version: !ruby/object:Gem::Version 
-  version: "0.10"
+  prerelease: false
+  segments: 
+  - 0
+  - 11
+  version: "0.11"
 platform: ruby
 authors: 
 - Pratik Naik
@@ -9,69 +13,95 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-02-19 00:00:00 +00:00
+date: 2010-05-11 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: activesupport
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
     requirements: 
-    - - "="
+    - - ~>
       - !ruby/object:Gem::Version 
-        version: 3.0.0.beta
-    version: 
+        segments: 
+        - 3
+        - 0
+        - 0
+        - beta3
+        version: 3.0.0.beta3
+  type: :runtime
+  version_requirements: *id001
 - !ruby/object:Gem::Dependency 
   name: activemodel
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
     requirements: 
-    - - "="
+    - - ~>
       - !ruby/object:Gem::Version 
-        version: 3.0.0.beta
-    version: 
+        segments: 
+        - 3
+        - 0
+        - 0
+        - beta3
+        version: 3.0.0.beta3
+  type: :runtime
+  version_requirements: *id002
 - !ruby/object:Gem::Dependency 
   name: arel
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        version: 0.2.1
-    version: 
+        segments: 
+        - 0
+        - 3
+        - 3
+        version: 0.3.3
+  type: :runtime
+  version_requirements: *id003
 - !ruby/object:Gem::Dependency 
   name: rack
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id004 !ruby/object:Gem::Requirement 
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        segments: 
+        - 1
+        - 1
+        - 0
         version: 1.1.0
-    version: 
+  type: :runtime
+  version_requirements: *id004
 - !ruby/object:Gem::Dependency 
   name: mysqlplus
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id005 !ruby/object:Gem::Requirement 
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        - 1
+        - 1
         version: 0.1.1
-    version: 
+  type: :runtime
+  version_requirements: *id005
 - !ruby/object:Gem::Dependency 
   name: eventmachine
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id006 !ruby/object:Gem::Requirement 
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        - 12
+        - 10
         version: 0.12.10
-    version: 
+  type: :runtime
+  version_requirements: *id006
 description: "    Cramp provides ORM and controller layers for developing asynchronous web applications.\n"
 email: pratiknaik@gmail.com
 executables: []
@@ -98,8 +128,10 @@ files:
 - lib/cramp/model/attribute.rb
 - lib/cramp/model/attribute_methods.rb
 - lib/cramp/model/base.rb
+- lib/cramp/model/callbacks.rb
 - lib/cramp/model/column.rb
 - lib/cramp/model/emysql_ext.rb
+- lib/cramp/model/engine/connection.rb
 - lib/cramp/model/engine.rb
 - lib/cramp/model/evented_mysql.rb
 - lib/cramp/model/finders.rb
@@ -121,18 +153,20 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.5
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
 summary: Async ORM and controller layer.