active_house 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 750a4b2223da7e48d6385f1295885788cd09a44d
-  data.tar.gz: 4a0211b8f81d576046032494d776dc9370bb1356
+  metadata.gz: 1881c335facd03315b054272bda63feb0dad94bc
+  data.tar.gz: 3ff3163f387c26d522c21ada86e53e428af96e6b
 SHA512:
-  metadata.gz: 6ea35d2e76cd912abf8502448fb8c4a3f5685358f62e005c5d1671eac42102063e77cb142aab814a405ea6f8660e1a5592f2d8f5512c741f9b50be9f8ad77854
-  data.tar.gz: eeeb5c7905db62293d8943f9cd8390fa2404902eb8866203460d5e6c46c7424f2d9b39778d24ad2d19e4b52f1d1ddb6efe5db8267cc5c5e7735acf9ffe520493
+  metadata.gz: 1c3855225c06b94397b6ab83ccd9eb016a49db843a423e0ccd8205c8c88a9eb41a55e56d952e68b34651ae6de5aa7eeb45244945eb95014e136b083900631e62
+  data.tar.gz: f95934da0a72bc53c9a95d026ae33a476eacc7718653585f44c83d5d7634a1dd125b6bd6a682c49094c207b20b7c2aa74abb6679cbc2cc7160cb0fd0394c1212

data/lib/active_house/collectable.rb

@@ -27,7 +27,7 @@ module ActiveHouse
 
     def fetch_collection
       result = connection.select_rows(to_query.squish)
-      result.map { |row| model_class.new(row) }
+      result.map { |row| model_class.load!(row) }
     end
   end
 end

data/lib/active_house/modeling.rb

@@ -18,7 +18,7 @@ module ActiveHouse
       end
 
       def attribute_method?(name, is_setter, *args)
-        (_attribute_opts.key?(name) || @_attributes.key?(name)) && (is_setter ? args.size.one? : true)
+        (_attribute_opts.key?(name) || @_attributes.key?(name)) && (is_setter ? args.size == 1 : true)
       end
 
       def get_attribute(name)
@@ -40,11 +40,17 @@ module ActiveHouse
         options = names.extract_options!
         names.each { |name| attributes(name, options.dup) }
       end
+
+      def load!(params)
+        new.tap do |model|
+          params.each { |name, value| model[name] = value }
+        end
+      end
     end
 
     def initialize(params = {})
       @_attributes = {}
-      assign_attributes(params)
+      assign_attributes(params) unless params.nil?
     end
 
     def as_json(*_args)
@@ -59,6 +65,16 @@ module ActiveHouse
       @_attributes[key.to_sym]
     end
 
+    def []=(key, value)
+      @_attributes[key.to_sym] = value
+    end
+
+    def assign_attributes(params)
+      params.each do |key, val|
+        public_send("#{key}=", val)
+      end
+    end
+
     def respond_to_missing?(method_name, *args)
       name, is_setter = parse_attribute_method_name(method_name)
       attribute_method?(name, is_setter, *args)

data/lib/active_house/query.rb

@@ -12,7 +12,7 @@ module ActiveHouse
     end
 
     def connection
-      model_klass.connection
+      model_class.connection
     end
 
     include ActiveHouse::Chainable

data/lib/active_house/scopeable.rb

@@ -17,7 +17,8 @@ module ActiveHouse
       end
 
       def apply_default_scope
-        apply_scope(model_class._default_scope) unless model_class._default_scope.nil?
+        return if model_class._default_scope.nil?
+        apply_scope(model_class._default_scope)
       end
     end
 

data/lib/active_house/scoping.rb

@@ -11,8 +11,8 @@ module ActiveHouse
     end
 
     class_methods do
-      def default_scope(&block)
-        self._default_scope = block
+      def default_scope(name)
+        self._default_scope = name.to_sym
       end
 
       def scope(name, block)

data/lib/active_house/version.rb

@@ -1,3 +1,3 @@
 module ActiveHouse
-  VERSION = '0.1.2'.freeze
+  VERSION = '0.1.3'.freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: active_house
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - Denis Talakevich