croudia 1.0.14 → 1.0.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cf93c107da3e67e76893d1ad119b53d1b6e111b3
-  data.tar.gz: 423b2e63ad81479d8d4c1666a99dd084f007a340
+  metadata.gz: ba8b2c711483759304f9c6e9d3142c595ba5f8fc
+  data.tar.gz: 2b00fe7aa4eed970cedfc9175bd3d49c0bdc1baf
 SHA512:
-  metadata.gz: dc0deaa61d80e277e8346209188b63e75cccbc27d5fadacea9ee1abf8d037b3f897560ec64e28bb278f079fa997b569c4e6dbd8d0f99efae32cb8eb92646877e
-  data.tar.gz: eb4fd9578e55b0c5468dd92776ffb8f871705956457d5acfbc4f198941f2715b51a72471ef28e9615aff210dbe128158ace2838f849bfb15c4eb75510d62a77a
+  metadata.gz: 724038816211fd2537c9cc8cbfe00d4476d58f4444318964d7d821f7c5faa15d5e5716358ac52f4155ae932ce64be48b46c3506ab95d3f5b7469b0060316712a
+  data.tar.gz: ea16c2207d4eae82ee7d1261f6047f7c7cad0dc2e01b647b2629877977347953b85cebacac57e352868f844505c17963efe927918858d2403fe7870a4bf3a76a

data/.travis.yml

@@ -2,3 +2,11 @@ language: ruby
 rvm:
   - 2.0.0
   - 1.9.3
+deploy:
+  provider: rubygems
+  api_key:
+    secure: UZBvpa1if3PwDR7xRI1Hrhzz9pu+jUcbsHuDrMAm8DYdNsiBfja6ZxSDFvF9S+wOtkQFLGzUJS8OXIL/iKar2aCTNZxqrTThehtOqhyGeBog/3omYUp5Hw3hBL3XFbls4cfBQZTRTD/LJHhRdi/bo3tI8aqqU5ulAx4F893KjNs=
+  gem: croudia
+  on:
+    tags: true
+    repo: wktk/croudia-gem

data/lib/croudia/access_token.rb

@@ -2,19 +2,14 @@ require 'croudia/base'
 
 module Croudia
   class AccessToken < Croudia::Base
-    KEYS = [
+    attr_reader(
       :access_token,
       :expires_in,
       :refresh_token,
-      :token_type,
-    ]
-
-    attr_reader(*KEYS)
+      :token_type
+    )
 
     alias :token :access_token
-
-    def to_s
-      access_token
-    end
+    alias :to_s :access_token
   end
 end

data/lib/croudia/base.rb

@@ -1,37 +1,71 @@
-module Croudia
-  class Base
-    class << self
-      def attr_reader(*attrs)
-        attrs.each do |attr|
-          define_method(attr) do
-            @attrs[attr.to_s] || @attrs[attr.to_sym]
-          end
-        end
-      end
-    end
-
-    # Initialize a new object
-    #
-    # @param attrs [Hash]
-    # @return [Croudia::Base]
-    def initialize(attrs = {})
-      @attrs = attrs || {}
-    end
-
-    # Fetch an attribute
-    #
-    # @param name [String, Symobol]
-    def [](name)
-      __send__(name.to_sym)
-    rescue NoMethodError
-      nil
-    end
-    
-    # @return [Hash]
-    def attrs
-      @attrs
-    end
-    alias to_h attrs
-    alias to_hash attrs
-  end
-end
+module Croudia
+  class Base
+    class << self
+      def attr_reader(*attrs)
+        attrs.each do |attr|
+          define_method(attr) do
+            @attrs[attr.to_s] || @attrs[attr.to_sym]
+          end
+        end
+      end
+
+      # @param attrs [Hash] { name: Class, name: Class, ... }
+      def attr_object_reader(attrs)
+        attrs.each_pair do |path, klass|
+          path = [path] unless path.is_a?(Array)
+          attr = path.join('_').to_sym
+
+          define_method(path.last) do
+            object = instance_variable_get("@#{attr}")
+
+            unless object
+              object_attrs = @attrs
+              path.each { |p| object_attrs = object_attrs[p.to_s] }
+
+              object = if object_attrs.nil?
+                nil
+              elsif klass.is_a?(Array)
+                klass = klass.shift
+                object_attrs.map { |o| klass.new(o) }
+              else
+                klass.new(object_attrs)
+              end
+
+              instance_variable_set("@#{attr}", object)
+            end
+
+            object
+          end
+        end
+      end
+    end
+
+    # Initialize a new object
+    #
+    # @param attrs [Hash]
+    # @return [Croudia::Base]
+    def initialize(attrs = {})
+      @attrs = attrs || {}
+    end
+
+    # Fetch an attribute
+    #
+    # @param name [String, Symobol]
+    def [](name)
+      __send__(name.to_sym)
+    rescue NoMethodError
+      nil
+    end
+    
+    # @return [Hash]
+    def attrs
+      @attrs
+    end
+    alias to_h attrs
+    alias to_hash attrs
+
+    def inspect
+      "#<#{self.class}:0x#{__id__.abs.to_s(16)} #{@attrs.inspect}>"
+    end
+  end
+end

data/lib/croudia/cursor.rb

@@ -2,20 +2,19 @@ require 'croudia/base'
 
 module Croudia
   class Cursor < Croudia::Base
-    KEYS = [
+    attr_reader(
       :next_cursor,
       :next_cursor_str,
       :previous_cursor,
-      :previous_cursor_str,
-    ]
-
-    attr_reader(*KEYS)
+      :previous_cursor_str
+    )
 
     def initialize(key, klass, attrs)
       if klass.is_a?(Class)
-        attrs[key.to_s].map! { |element| klass.new(element) }
+        singleton_class.attr_object_reader(key => Array(klass))
+      else
+        singleton_class.attr_reader(key)
       end
-      singleton_class.attr_reader(key)
       super(attrs)
     end
 

data/lib/croudia/entities.rb

@@ -3,15 +3,8 @@ require 'croudia/entity/media'
 
 module Croudia
   class Entities < Croudia::Base
-    KEYS = [
-      :media,
-    ]
-    attr_reader(*KEYS)
-
-    def initialize(attrs)
-      media = attrs.delete('media')
-      super(attrs)
-      @attrs['media'] = Croudia::Entity::Media.new(media) if media
-    end
+    attr_object_reader(
+      media: Croudia::Entity::Media
+    )
   end
 end

data/lib/croudia/entity/media.rb

@@ -3,11 +3,10 @@ require 'croudia/base'
 module Croudia
   module Entity
     class Media < Croudia::Base
-      KEYS = [
+      attr_reader(
         :media_url_https,
-        :type,
-      ]
-      attr_reader(*KEYS)
+        :type
+      )
     end
   end
 end

data/lib/croudia/identity.rb

@@ -2,6 +2,11 @@ require 'croudia/base'
 
 module Croudia
   class Identity < Croudia::Base
+    attr_reader(
+      :id,
+      :id_str
+    )
+
     def initialize(*)
       super
       raise ArgumentError, 'argument must have an "id" key' unless id
@@ -13,10 +18,5 @@ module Croudia
     def ==(other)
       super || self.class == other.class && id == other.id
     end
-
-    # @return [Integer]
-    def id
-      @attrs['id'] || @attrs[:id]
-    end
   end
 end

data/lib/croudia/relationship.rb

@@ -1,20 +1,12 @@
 require 'croudia/base'
 
 class Croudia::Relationship < Croudia::Base
-  KEYS = [
-    :souorce,
-    :target,
-  ]
+  attr_object_reader(
+    [:relationship, :source] => Croudia::User,
+    [:relationship, :target] => Croudia::User
+  )
 
   def relationship
     self
   end
-
-  def source
-    @source ||= Croudia::User.new(@attrs['relationship']['source'])
-  end
-
-  def target
-    @target ||= Croudia::User.new(@attrs['relationship']['target'])
-  end
 end

data/lib/croudia/search_metadata.rb

@@ -2,7 +2,7 @@ require 'croudia/base'
 
 module Croudia
   class SearchMetadata < Croudia::Base
-    KEYS = [
+    attr_reader(
       :completed_in,
       :count,
       :max_id,
@@ -11,9 +11,7 @@ module Croudia
       :query,
       :refresh_url,
       :since_id,
-      :since_ids_str,
-    ]
-
-    attr_reader(*KEYS)
+      :since_ids_str
+    )
   end
 end

data/lib/croudia/search_results.rb

@@ -4,19 +4,9 @@ require 'croudia/status'
 
 module Croudia
   class SearchResults < Croudia::Base
-    KEYS = [
-      :search_metadata,
-      :statuses,
-    ]
-
-    attr_reader(*KEYS)
-
-    def initialize(attrs)
-      statuses = attrs.delete('statuses')
-      metadata = attrs.delete('search_metadata')
-      attrs['statuses'] = statuses.map { |s| Croudia::Status.new(s) }
-      attrs['search_metadata'] = Croudia::SearchMetadata.new(metadata)
-      super(attrs)
-    end
+    attr_object_reader(
+      search_metadata: Croudia::SearchMetadata,
+      statuses: Array(Croudia::Status)
+    )
   end
 end

data/lib/croudia/secret_mail.rb

@@ -5,25 +5,17 @@ module Croudia
   class SecretMail < Croudia::Identity
     include Croudia::Creatable
 
-    KEYS = [
-      :id_str,
-      :recipient,
+    attr_reader(
       :recipient_id,
       :recipient_screen_name,
-      :sender,
       :sender_id,
       :sender_screen_name,
-      :text,
-    ]
+      :text
+    )
 
-    attr_reader(*KEYS)
-
-    def initialize(attrs)
-      recipient = attrs.delete('recipient')
-      sender = attrs.delete('sender')
-      super(attrs)
-      @attrs['recipient'] = Croudia::User.new(recipient) if recipient
-      @attrs['sender'] = Croudia::User.new(sender) if sender
-    end
+    attr_object_reader(
+      recipient: Croudia::User,
+      sender: Croudia::User
+    )
   end
 end

data/lib/croudia/source.rb

@@ -2,19 +2,16 @@ require 'croudia/base'
 
 module Croudia
   class Source < Croudia::Base
-
-    KEYS = [
+    attr_reader(
       :name,
-      :url,
-    ]
+      :url
+    )
 
-    attr_reader(*KEYS)
     alias to_s name
 
     def ==(other)
       super || (other.is_a?(Croudia::Source) &&
         name == other.name && url == other.url)
     end
-
   end
 end

data/lib/croudia/status.rb

@@ -8,39 +8,25 @@ module Croudia
   class Status < Croudia::Identity
     include Croudia::Creatable
 
-    KEYS = [
-      :id_str,
-      :entities,
+    attr_reader(
       :favorited,
       :favorited_count,
       :in_reply_to_screen_name,
-      :in_reply_to_status_id_str,
       :in_reply_to_status_id,
-      :in_reply_to_user_id_str,
+      :in_reply_to_status_id_str,
       :in_reply_to_user_id, 
+      :in_reply_to_user_id_str,
       :spread, 
       :spread_count, 
-      :spread_status,
-      :reply_status,
-      :source,
       :text,
-      :user,
-    ]
-
-    attr_reader(*KEYS)
+    )
 
-    def initialize(attrs={})
-      entities = attrs.delete('entities')
-      user = attrs.delete('user')
-      reply_status = attrs.delete('reply_status')
-      spread_status = attrs.delete('spread_status')
-      source = attrs.delete('source')
-      super(attrs)
-      @attrs['entities'] = Croudia::Entities.new(entities) if entities
-      @attrs['user'] = Croudia::User.new(user) if user
-      @attrs['reply_status'] = Croudia::Status.new(reply_status) if reply_status
-      @attrs['spread_status'] = Croudia::Status.new(spread_status) if spread_status
-      @attrs['source'] = Croudia::Source.new(source) if source
-    end
+    attr_object_reader(
+      entities: Croudia::Entities,
+      reply_status: Croudia::Status,
+      spread_status: Croudia::Status,
+      source: Croudia::Source,
+      user: Croudia::User
+    )
   end
 end 

data/lib/croudia/user.rb

@@ -5,8 +5,7 @@ module Croudia
   class User < Croudia::Identity
     include Croudia::Creatable
 
-    KEYS = [
-      :id_str,
+    attr_reader(
       :blocking,
       :connections,
       :description,
@@ -22,9 +21,7 @@ module Croudia
       :protected,
       :screen_name,
       :statuses_count,
-      :url,
-    ]
-
-    attr_reader(*KEYS)
+      :url
+    )
   end
 end

data/lib/croudia/version.rb

@@ -1,3 +1,3 @@
 module Croudia
-  VERSION = '1.0.14'
+  VERSION = '1.0.15'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: croudia
 version: !ruby/object:Gem::Version
-  version: 1.0.14
+  version: 1.0.15
 platform: ruby
 authors:
 - wktk
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-09 00:00:00.000000000 Z
+date: 2013-09-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday