clean_model 0.0.5 → 0.0.6

data/lib/clean_model/base.rb

@@ -1,63 +1,63 @@
-module CleanModel
-  module Base
-
-    def self.included(base)
-      base.send :extend, ClassMethods
-      base.send :include, InstanceMethods
-      base.send :extend, ActiveModel::Translation
-      base.send :include, ActiveModel::Validations
-    end
-
-    module ClassMethods
-
-      def attribute(name, options={})
-        attr = Attribute.new(name, options)
-        attributes << attr
-
-        define_method name do
-          instance_variable_get "@#{name}"
-        end
-
-        define_method "#{name}=" do |value|
-          value = attr.transform(value)
-          attr.validate!(value)
-          instance_variable_set "@#{name}", value
-        end
-      end
-
-      def attributes
-        @attributes ||= []
-      end
-
-      def attribute_names
-        attributes.map(&:name)
-      end
-
-    end
-
-    module InstanceMethods
-
-      def initialize(attributes={})
-        self.class.attributes.each { |a| a.assign_default(self) }
-        if block_given?
-          yield(self)
-        else
-          assign_attributes attributes
-        end
-      end
-
-      def assign_attributes(attributes)
-        return nil unless attributes
-        attributes.each do |name, value|
-          send("#{name}=", value) if respond_to?("#{name}=")
-        end
-      end
-
-      def attributes
-        Hash[self.class.attribute_names.map { |a| [a, send(a)] }]
-      end
-
-    end
-
-  end
+module CleanModel
+  module Base
+
+    def self.included(base)
+      base.send :extend, ClassMethods
+      base.send :include, InstanceMethods
+      base.send :extend, ActiveModel::Translation
+      base.send :include, ActiveModel::Validations
+    end
+
+    module ClassMethods
+
+      def attribute(name, options={})
+        attr = Attribute.new(name, options)
+        attributes << attr
+
+        define_method name do
+          instance_variable_get "@#{name}"
+        end
+
+        define_method "#{name}=" do |value|
+          value = attr.transform(value)
+          attr.validate!(value)
+          instance_variable_set "@#{name}", value
+        end
+      end
+
+      def attributes
+        @attributes ||= []
+      end
+
+      def attribute_names
+        attributes.map(&:name)
+      end
+
+    end
+
+    module InstanceMethods
+
+      def initialize(attributes={})
+        self.class.attributes.each { |a| a.assign_default(self) }
+        if block_given?
+          yield(self)
+        else
+          assign_attributes attributes
+        end
+      end
+
+      def assign_attributes(attributes)
+        return nil unless attributes
+        attributes.each do |name, value|
+          send("#{name}=", value) if respond_to?("#{name}=")
+        end
+      end
+
+      def attributes
+        Hash[self.class.attribute_names.map { |a| [a, send(a)] }]
+      end
+
+    end
+
+  end
 end

data/lib/clean_model/exceptions.rb

@@ -1,30 +1,18 @@
-module CleanModel
-
-  class Error < StandardError
-  end
-
-  class InvalidTypeAssignment < Error
-    def initialize(attribute, value)
-      super "#{value} is not valid for #{attribute}"
-    end
-  end
-
-  class UndefinedPersistenceMethod < Error
-    def initialize(klass, method)
-      super "#{klass} must define method [#{method}]"
-    end
-  end
-
-  class InvalidResponse < Error
-    def initialize(response)
-      super response.content_type == 'application/json' ? response.body : "#{response.code} - Unexpected error"
-    end
-  end
-
-  class ConnectionFail < Error
-    def initialize(exception)
-      super exception.message
-    end
-  end
-
+module CleanModel
+
+  class Error < StandardError
+  end
+
+  class InvalidTypeAssignment < Error
+    def initialize(attribute, value)
+      super "#{value} is not valid for #{attribute}"
+    end
+  end
+
+  class UndefinedPersistenceMethod < Error
+    def initialize(klass, method)
+      super "#{klass} must define method [#{method}]"
+    end
+  end
+
 end

data/lib/clean_model/persistent.rb

@@ -1,76 +1,76 @@
-module CleanModel
-  module Persistent
-
-    def self.included(base)
-      base.send :include, Base
-      base.send :extend, ClassMethods
-      base.send :include, InstanceMethods
-      base.send :include, ActiveModel::Conversion
-
-      base.attribute :id
-    end
-
-    module ClassMethods
-
-      def create(attributes={})
-        begin
-          create! attributes
-        rescue
-          nil
-        end
-      end
-
-      def create!(attributes={})
-        model = new attributes
-        model.save!
-        model
-      end
-
-    end
-
-    module InstanceMethods
-
-      def new_record?
-        id.nil?
-      end
-
-      def persisted?
-        !new_record?
-      end
-
-      def save!
-        raise errors.full_messages.join("\n") unless save
-      end
-
-      def save
-        return false unless valid?
-        new_record? ? create : update
-      end
-
-      def update_attributes(attributes)
-        assign_attributes attributes
-        save
-      end
-
-      def destroy
-        delete
-      end
-
-      private
-
-      def create
-        raise UndefinedPersistenceMethod.new(self.class, :create)
-      end
-
-      def update
-        raise UndefinedPersistenceMethod.new(self.class, :update)
-      end
-
-      def delete
-        raise UndefinedPersistenceMethod.new(self.class, :delete)
-      end
-
-    end
-
-  end
+module CleanModel
+  module Persistent
+
+    def self.included(base)
+      base.send :include, Base
+      base.send :extend, ClassMethods
+      base.send :include, InstanceMethods
+      base.send :include, ActiveModel::Conversion
+
+      base.attribute :id
+    end
+
+    module ClassMethods
+
+      def create(attributes={})
+        begin
+          create! attributes
+        rescue
+          nil
+        end
+      end
+
+      def create!(attributes={})
+        model = new attributes
+        model.save!
+        model
+      end
+
+    end
+
+    module InstanceMethods
+
+      def new_record?
+        id.nil?
+      end
+
+      def persisted?
+        !new_record?
+      end
+
+      def save!
+        raise errors.full_messages.join("\n") unless save
+      end
+
+      def save
+        return false unless valid?
+        new_record? ? create : update
+      end
+
+      def update_attributes(attributes)
+        assign_attributes attributes
+        save
+      end
+
+      def destroy
+        delete
+      end
+
+      private
+
+      def create
+        raise UndefinedPersistenceMethod.new(self.class, :create)
+      end
+
+      def update
+        raise UndefinedPersistenceMethod.new(self.class, :update)
+      end
+
+      def delete
+        raise UndefinedPersistenceMethod.new(self.class, :delete)
+      end
+
+    end
+
+  end
 end

data/lib/clean_model/remote.rb

@@ -1,97 +1,76 @@
-module CleanModel
-  module Remote
-
-    def self.included(base)
-      base.send :include, Persistent
-      base.send :extend, ClassMethods
-      base.send :include, InstanceMethods
-    end
-
-    module ClassMethods
-
-      def connection(connection=nil)
-        connection ? @connection = connection : @connection
-      end
-
-      def http
-        WebClient::Base.new(connection)
-      end
-
-      def http_get(path, data=nil, headers={})
-        begin
-          response = http.get(path, data, headers)
-          if response.is_a?(Net::HTTPSuccess)
-            block_given? ? yield(response) : response
-          else
-            raise InvalidResponse.new(response)
-          end
-        rescue WebClient::Error => ex
-          raise ConnectionFail.new(ex)
-        end
-      end
-
-    end
-
-    module InstanceMethods
-
-      def http
-        self.class.http
-      end
-
-      def http_get(path, data={}, &block)
-        self.class.http_get(path, data, &block)
-      end
-
-      def wrapped_attributes(options={})
-        exceptions = options[:except] ? [options[:except]].flatten.map(&:to_sym) : []
-        attributes.reject { |k, v| v.nil? || exceptions.include?(k) }.inject({}) { |h, (k, v)| h["#{options[:wrapper] || self.class.to_s.demodulize.underscore}[#{k}]"] = v; h }
-      end
-
-      def save
-        return false unless valid?
-        begin
-          response = new_record? ? create : update
-          if response.is_a?(Net::HTTPSuccess)
-            save_success(response)
-          else
-            save_fail(response)
-          end
-        rescue WebClient::Error => ex
-          errors[:base] = ex.message
-        end
-        errors.empty?
-      end
-
-      def destroy
-        return true if new_record?
-        begin
-          response = delete
-          unless response.is_a?(Net::HTTPSuccess)
-            errors[:base] = response.content_type == 'application/json' ? response.body : "#{response.code} - Unexpected error"
-          end
-        rescue WebClient::Error => ex
-          errors[:base] = ex.message
-        end
-        errors.empty?
-      end
-
-      private
-
-      def save_success(response)
-        assign_attributes JSON.parse(response.body) if response.body
-      end
-
-      def save_fail(response)
-        if response.code.to_i == 422 #:unprocessable_entity
-          JSON.parse(response.body).each do |attribute, messages|
-            messages.each { |m| errors[attribute.to_sym] << m }
-          end
-        else
-          errors[:base] = response.content_type == 'application/json' ? response.body : "#{response.code} - Unexpected error"
-        end
-      end
-
-    end
-
-  end
+module CleanModel
+  module Remote
+
+    def self.included(base)
+      base.send :include, Persistent
+      base.send :extend, ClassMethods
+      base.send :include, InstanceMethods
+    end
+
+    module ClassMethods
+
+      def connection(connection=nil)
+        connection ? @connection = WebClient::Connection.new(connection) : @connection
+      end
+
+    end
+
+    module InstanceMethods
+
+      def save
+        return false unless valid?
+        begin
+          response = new_record? ? create : update
+          if response.success?
+            save_success(response)
+          else
+            save_fail(response)
+          end
+        rescue WebClient::Error => ex
+          errors[:base] = ex.message
+        end
+        errors.empty?
+      end
+
+      def destroy
+        return true if new_record?
+        begin
+          response = delete
+          unless response.success?
+            errors[:base] = response.content_type == 'application/json' ? response.body : "#{response.code} - Unexpected error"
+          end
+        rescue WebClient::Error => ex
+          errors[:base] = ex.message
+        end
+        errors.empty?
+      end
+
+      private
+
+      def connection
+        self.class.connection
+      end
+
+      def wrapped_attributes(options={})
+        exceptions = options[:except] ? [options[:except]].flatten.map(&:to_sym) : []
+        attributes.reject { |k, v| v.nil? || exceptions.include?(k) }.inject({}) { |h, (k, v)| h["#{options[:wrapper] || self.class.to_s.demodulize.underscore}[#{k}]"] = v; h }
+      end
+
+      def save_success(response)
+        assign_attributes JSON.parse(response.body) if response.body
+      end
+
+      def save_fail(response)
+        if response.code.to_i == 422 #:unprocessable_entity
+          JSON.parse(response.body).each do |attribute, messages|
+            messages.each { |m| errors[attribute.to_sym] << m }
+          end
+        else
+          errors[:base] = response.content_type == 'application/json' ? response.body : "#{response.code} - Unexpected error"
+        end
+      end
+
+    end
+
+  end
 end

data/lib/clean_model/version.rb

@@ -1,3 +1,3 @@
-module CleanModel
-  VERSION = '0.0.5'
-end
+module CleanModel
+  VERSION = '0.0.6'
+end

data/lib/clean_model.rb

@@ -1,11 +1,11 @@
-require 'active_model'
-require 'active_support/all'
-require 'web_client'
-require 'json'
-
-require 'clean_model/version'
-require 'clean_model/attribute'
-require 'clean_model/exceptions'
-require 'clean_model/base'
-require 'clean_model/persistent'
-require 'clean_model/remote'
+require 'active_model'
+require 'active_support/all'
+require 'web_client'
+require 'json'
+
+require 'clean_model/version'
+require 'clean_model/attribute'
+require 'clean_model/exceptions'
+require 'clean_model/base'
+require 'clean_model/persistent'
+require 'clean_model/remote'