mogli 0.0.23 → 0.0.24

data/lib/mogli.rb

@@ -3,7 +3,6 @@ module Mogli
 end
 
 require "httparty"
-require "hashie"
 
 
 require "mogli/authenticator"

data/lib/mogli/model.rb

@@ -1,7 +1,7 @@
 require 'mogli/model/search'
 
 module Mogli
-  class Model < Hashie::Dash
+  class Model  
     extend Mogli::Model::Search
 
     set_search_type :all
@@ -17,25 +17,25 @@ module Mogli
     end
 
     def initialize(hash={},client=nil)
+      @_values = {}
       self.client=client
-      super(hash||{})
+      hash.each do |k,v|
+        self.send("#{k}=",v)
+      end
     end
 
     def post_params
       post_params = {}
       self.class.creation_keys.each do |key|
-        post_params[key] = self[key]
+        post_params[key] =  @_values[key.to_s]
 
         # make sure actions and any other creation_properties that aren't just
         # hash entries get added...
-        if post_params[key].nil? &&
-           self.respond_to?(key.to_sym) && !self.send(key.to_sym).nil?
-
-          val = self.send(key.to_sym)
-          post_params[key] = if val.respond_to?(:to_json)
+        if post_params[key].nil? && self.respond_to?(key.to_sym) && !(val=self.send(key.to_sym)).nil?
+           post_params[key] = if val.is_a?(Array)
+                                "[#{val.map { |v| v.respond_to?(:to_json) ? v.to_json : nil }.compact.join(',')}]"  
+                             elsif val.respond_to?(:to_json)
                                val.to_json
-                             elsif val.is_a?(Array)
-                               "[#{val.map { |v| v.respond_to?(:to_json) ? v.to_json : nil }.compact.join(',')}]"
                              else
                                nil
                              end
@@ -66,6 +66,19 @@ module Mogli
       puts "Warning: property #{property} doesn't exist for class #{self.class.name}"
     end
 
+    def self.property(arg)
+      @properties ||= []
+      @properties << arg
+      define_method arg do
+        @_values[arg.to_s]
+      end
+      define_method "#{arg}=" do |val|
+        @_values[arg.to_s] = val
+      end
+    end
+    
+        
+
     def self.define_properties(*args)
       args.each do |arg|
         property arg
@@ -122,7 +135,11 @@ module Mogli
       other = self.class.find(id,client)
       merge!(other) if other
     end
-
+    
+    def merge!(other)
+      @_values.merge!(other.instance_variable_get("@_values"))
+    end
+    
     def self.recognize?(data)
       true
     end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: mogli
 version: !ruby/object:Gem::Version 
-  hash: 49
+  hash: 47
   prerelease: false
   segments: 
   - 0
   - 0
-  - 23
-  version: 0.0.23
+  - 24
+  version: 0.0.24
 platform: ruby
 authors: 
 - Mike Mangino
@@ -18,26 +18,10 @@ cert_chain: []
 date: 2011-02-01 00:00:00 -05:00
 default_executable: 
 dependencies: 
-- !ruby/object:Gem::Dependency 
-  name: hashie
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 23
-        segments: 
-        - 0
-        - 2
-        - 0
-        version: 0.2.0
-  type: :runtime
-  version_requirements: *id001
 - !ruby/object:Gem::Dependency 
   name: httparty
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -49,7 +33,7 @@ dependencies:
         - 3
         version: 0.4.3
   type: :runtime
-  version_requirements: *id002
+  version_requirements: *id001
 description: Simple library for accessing the facebook Open Graph API
 email: mmangino@elevatedrails.com
 executables: []