mxhero-api 0.1.24 → 0.1.25

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ZjNmYmVlYjc4MDk3NDRmMjRhNWRlM2RmYjNjOTJjM2M4MDI2NTJhMA==
+    OGQ3ZGYzMWMwZDkwNDVkYTFkNzZmZjVkYmY5MDliYmZjMzA3MmJjZg==
   data.tar.gz: !binary |-
-    YTFiMWUwOTcwZTAwYTQ2OTEyYjA0Mzk1MDk0MzE4M2RlMGFlMDFiMQ==
+    N2JkNGE1ODBhOWM5Y2NmZTRhMjE3OGYyNzg3Njk4NDczY2M2NzI0Zg==
 SHA512:
   metadata.gz: !binary |-
-    NjJiNzBlYzIzNjQzNmJjYTIwOTdhNzJkNjAxNDU2MDI2NTJjZWE0NTFkMTY2
-    ODBkZWVhOTZiYjU0YTkzMmM1OTA1YjA5ZTk5MDNkNGNlOGQ1NWM5MzQxZmFl
-    ODc2ZDA3NmQyOWJmMDM0ZDc3NDk0ZTdiZDg3MGUxNTQ1ZDU3N2Q=
+    ZWYxYWE4NDIzODY5NTIxMjk5OTQ1YzI5NGJmMjhmZjcxNmUyY2M5ZTQ2MGRl
+    OTI1OTFjOTAwZjdlY2Y1NTY4M2M2MGI5YWJhNDAwN2Y4MGQzYTUwOGM5MTAw
+    Yzc2MjdkNTQ0N2Y5NDUwY2U0ZGY3YjI3NDI2ZDgyY2JjYmE2MTU=
   data.tar.gz: !binary |-
-    OTk0MjAxM2U5ZjdjNmExYTkwN2Y4NzgyODQ0MmYyZDQ4OTBiYTYzNjk0Y2Fi
-    ZTkxN2RiMmU0ZWM5YjgzNzBjOWE4MjA0OGYyMGM0MjYxMWUyNTQ3MjA5ZGZk
-    NThhOGZlMmQ5OGM4MGFkOTkxMmZmM2QxMGM3YTY4NGI3ZTRhYTI=
+    MWU3Y2EyMzVmMmQ0ODQ5NjIyNWIzMDQyOGY3N2NiZjU2NWIzMzg0MmRiYjY5
+    MjdmYWZlZTI2OWUzZWFkNjQwODY5Y2M0NWQzYzQ2MzUwMjMzZDQ1ZWE1MTgw
+    YjQzYzRiOGUyZGE2MDA5ZDM1ZGQxODJkNzc5MTlkZjQ1ZTdlMmU=

data/VERSION

@@ -1 +1 @@
-0.1.24
+0.1.25

data/lib/groups.rb

@@ -6,34 +6,6 @@ require 'delegate'
 
 module MxHero::API
 
-  # A group instance
-  #
-  class Group < Struct.new(:name, :domain, :description)
-    def initialize(elements)
-      elements.each { |prop, value| send("#{prop}=", value) if respond_to?("#{prop}") }
-    end
-
-    def to_json
-      { name: name, domain: domain, description: description }.to_json
-    end
-  end
-
-
-  class Account < Struct.new(:account, :domain, :created_date, :updated_date, :group)
-    def initialize(elements)
-      elements.each { |prop, value| send("#{prop}=", value) if respond_to?("#{prop}") }
-    end
-
-    def to_json
-      { account: account, domain: domain, createdDate: created_date, updatedDate: updated_date, group: group }.to_json
-    end
-
-    def to_s
-      "account: #{account}, domain: #{domain}, group: #{group}" 
-    end
-  end
-
-
   class PaginatedElements < SimpleDelegator
     attr_reader :total_elements, :total_pages, :actual_page
     def initialize(paginable, total_elements, total_pages, actual_page)

data/lib/mxhero-api.rb

@@ -2,11 +2,15 @@
 require 'httpclient'
 require 'json'
 
-require_relative 'communication'
-require_relative 'urls'
-require_relative 'groups'
-require_relative 'dto'
-require_relative 'directories'
+require 'communication'
+require 'urls'
+require 'groups'
+require 'dto'
+require 'directories'
+require 'resource'
+require 'resources/account'
+require 'resources/domain'
+require 'resources/group'
 
 module MxHero::API
   # The class that contains the response information
@@ -35,41 +39,6 @@ module MxHero::API
     alias_method :content=, :msg=
   end
 
-
-  #class Account
-  #  attr_accessor :account, :domain, :created_date, :updated_date, :group, :properties
-  #  
-  #  def initialize(props = {})
-  #    @account = props[:account] 
-  #    @domain = props[:domain] 
-  #    @created_date = props[:created_date] || props[:createdDate]
-  #    @updated_date = props[:updated_date] || props[:updatedDate]
-  #    @group = props[:group]
-  #    @properties = props[:properties] || []
-  #  end
-
-  #  def to_json
-  #    { account: account, domain: domain, 
-  #      createdDate: created_date, 
-  #      updatedDate: updated_date,
-  #      group: group,
-  #      properties: properties }.to_json
-  #  end
-
-  #  def to_s
-  #    """
-  #    account: #{account}
-  #    domain: #{domain}
-  #    updated_date: #{updated_date}
-  #    created_date: #{created_date}
-  #    group: #{group}
-  #    properties: #{properties}
-  #    """
-  #  end
-
-  #end
-
-
   # A client to interact with mxhero engine API
   class Client
     include Communication
@@ -143,27 +112,34 @@ module MxHero::API
       response_as_a_hash 
     end
 
+
+    # Move COS to trial
+    # @return true | false
+    def move_to_trial(domain)
+      url = domain_by_id_url(domain) + '/cos/trial'
+      response = call(:put, url)
+      response.status == 200
+    end
+
     
     # Retrive the domain information 
     # 
     # @param name The domain name or id. For example: 'mydomain.com'
-    # @return [Hash] with the domain attributes if exist
-    #   * :domain [String]
-    #   * :server [String]
-    #   * :creationDate [Fixnum]
-    #   * :updateDate [Fixnum]
-    #   * :aliases [Array<String>]
-    #   * :ldap
-    #   
-    #   Or nil if not found
+    # @return [Domain] or nil if not found
     #
     # @raise an exception when the status code is not 200 (ok) or 404 (not found)
     #
     def domain(name)
-      fetch domain_by_id_url(name), 
-           on_error: "An error ocurred when try to fetch the domain #{name}."
+      domain_info = fetch domain_by_id_url(name), on_error: "An error ocurred when try to fetch the domain #{name}."
+      return nil unless domain_info
+      Domain.new domain_info
     end
 
+    #def update_cos(domain, cos)
+    #  domain_by_id_url(name) + "cos/#{cos}"
+    #  response = call(:post, url, msg.to_json, throw_exception: false)
+    #end
+
 
     # Fetch the LDAP information of the domain
     #

data/lib/resource.rb

@@ -0,0 +1,103 @@
+module MxHero::API
+
+  # Base resource 
+  #
+  # Example of use:
+  #
+  #     class User < MxHero::API::Resource
+  #       attribute :first_name, map: 'firstName'  # Map the resource attribute (hash key) from firstName
+  #       attribute :last_name,  map: 'lastName'
+  #       attribute :updated, date: true
+  #       attribute :age
+  #     end
+  #
+  # The map in attribute indicate that can build an instance with a Hash that contains :firstName to set 
+  # first_name instance attribute.
+  # 
+  # Or:
+  #
+  #   class User < MxHero::API::Resource
+  #     attributes :first_name, :last_name, :age
+  #   end
+  #
+  class Resource
+
+    # Create an instance attribute and accessors
+    # If indicate map in more parameter (ex.: map: 'firstName') that can
+    # be set in the construction with a Hash that contains :firstName
+    # Can use date: true to manage date fields as Unix epoch integers
+    #
+    # Ex.: attribute :first_name, map: 'firstName'
+    #
+    def self.attribute(name, more = {})
+      instance_variable_set(:"@#{name}", nil)
+      attr_accessor :"#{name}"
+      map(name, more[:map]) if more.has_key?(:map)
+      date_accessor(name) if more.fetch(:date, false)
+    end
+
+    
+    # Create a list of attributes
+    #
+    # Ex.: attributes :first_name, :last_name, :age
+    #
+    def self.attributes(*attrs)
+      attrs.each { |attr| attribute(attr) }
+    end
+
+    def initialize(data)
+      return unless data
+      data.each do |variable, value|
+        set = "#{variable}="
+        send(set, value) if respond_to? set
+      end
+      self.class.mappings.each do |attr, map|
+        send("#{attr}=", data[map]) if data.key?(map) 
+      end
+    end
+
+    def to_json
+      hash = Hash.new
+      instance_variables.each do |variable|
+        attr = variable[1..-1].to_sym
+        key = self.class.mappings.fetch(attr, attr)
+        hash[key] = instance_variable_get(variable)
+        if self.class.date_attributes.include?(attr)
+          hash[key] = hash[key].strftime('%Q')
+        end
+      end
+      hash.to_json
+    end
+
+    private
+
+    def self.mappings
+      @mappings
+    end
+
+    def self.map(attr, map)
+      @mappings ||= {}
+      @mappings[attr.to_sym] = map.to_sym
+    end
+    
+    def self.date_attributes
+      @date_attributes || []
+    end
+    
+    def self.date_accessor(attribute)
+      @date_attributes ||= []
+      @date_attributes << attribute
+     
+      # Redefine the setter to support Unix Epoch (integer or string) or date
+      define_method("#{attribute}=") do |date| 
+        if date.is_a? Integer or date.is_a? String
+          instance_variable_set "@#{attribute}", DateTime.strptime(date.to_s, '%Q')
+        else
+          instance_variable_set "@#{attribute}", date
+        end
+      end
+
+    end
+
+  end
+end

data/lib/resources/account.rb

@@ -0,0 +1,18 @@
+
+module MxHero::API
+  
+  class Account < Struct.new(:account, :domain, :created_date, :updated_date, :group)
+    def initialize(elements)
+      elements.each { |prop, value| send("#{prop}=", value) if respond_to?("#{prop}") }
+    end
+
+    def to_json
+      { account: account, domain: domain, createdDate: created_date, updatedDate: updated_date, group: group }.to_json
+    end
+
+    def to_s
+      "account: #{account}, domain: #{domain}, group: #{group}" 
+    end
+  end
+
+end

data/lib/resources/domain.rb

@@ -0,0 +1,58 @@
+module MxHero::API
+  
+  class Domain < Resource
+
+    attributes :domain, :server, :creation_date, :update_date, 
+      :aliases, :features, :cos, :cos_last_change
+
+    attribute :creation_date, map: 'creationDate', date: true
+    attribute :update_date, map: 'updateDate', date: true
+    attribute :cos_last_change, map: 'cosLastChange', date: true
+
+    def initialize(data = {})
+      super(data)
+      load_features(features)
+      load_cos(cos)
+    end
+
+    def change_to_trial
+      if cos.type == 'free'
+        cos.type = 'trial'     
+      end
+    end
+       
+    private 
+     
+    def load_cos(cos)
+      @cos = Cos.new cos
+    end
+
+    def load_features(features)
+      @features = features.map { |feature| Feature.new feature }
+    end
+  end
+
+
+  class Feature < Resource
+    attribute :component, map: 'feature'
+    attributes :created, :updated, :metadata
+    attribute :max_rules_amount, map: 'maxRulesAmount'
+
+    def initialize(data = {})
+      super(data)
+      if max_rules_amount == 0 || max_rules_amount.nil?
+        @max_rules_amount = Float::INFINITY
+      end
+    end
+
+    def unlimited_use?
+      max_rules_amount == Float::INFINITY
+    end
+  end
+
+  class Cos < Resource
+    attribute :type, map: 'cos'
+    attribute :edition
+  end
+
+end

data/lib/resources/group.rb

@@ -0,0 +1,15 @@
+module MxHero::API
+
+  # A group instance
+  #
+  class Group < Struct.new(:name, :domain, :description)
+    def initialize(elements)
+      elements.each { |prop, value| send("#{prop}=", value) if respond_to?("#{prop}") }
+    end
+
+    def to_json
+      { name: name, domain: domain, description: description }.to_json
+    end
+  end
+
+end

data/mxhero-api.gemspec

@@ -1,22 +1,22 @@
 # -*- encoding: utf-8 -*-
-# stub: mxhero-api 0.1.24 ruby lib
+# stub: mxhero-api 0.1.25 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "mxhero-api"
-  s.version = "0.1.24"
+  s.version = "0.1.25"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Maximiliano Dello Russo", "Juan Pablo Royo", "mxHero"]
-  s.date = "2013-12-10"
+  s.date = "2013-12-27"
   s.description = "A gem to provide easy access to the API of MxHero platform (http://www.mxhero.com/)"
   s.email = ["maxidr@mxhero.com", "juanpablo.royo@gmail.com", "mxhero@mxhero.com"]
-  s.files = [".gitignore", ".rvmrc", "Gemfile", "LICENSE.txt", "README.md", "Rakefile", "VERSION", "lib/communication.rb", "lib/directories.rb", "lib/dto.rb", "lib/groups.rb", "lib/mxhero-api.rb", "lib/urls.rb", "mxhero-api.gemspec", "test/fixtures/api/account_properties.yml", "test/fixtures/api/account_properties_not_found.yml", "test/fixtures/api/accounts.yml", "test/fixtures/api/accounts_filtered.yml", "test/fixtures/api/accounts_from_domain.yml", "test/fixtures/api/accounts_from_domain_paginated.yml", "test/fixtures/api/accounts_without_group.yml", "test/fixtures/api/add_an_inexistent_account_to_group.yml", "test/fixtures/api/add_and_remove_account.yml", "test/fixtures/api/all_groups.yml", "test/fixtures/api/create_directory.yml", "test/fixtures/api/create_rule_for_domain.yml", "test/fixtures/api/delete_directory.yml", "test/fixtures/api/delete_group.yml", "test/fixtures/api/delete_rule.yml", "test/fixtures/api/domain_by_id.yml", "test/fixtures/api/domain_by_id_not_found.yml", "test/fixtures/api/domain_rule.yml", "test/fixtures/api/domains.yml", "test/fixtures/api/fetch_directory.yml", "test/fixtures/api/ldap_info.yml", "test/fixtures/api/refresh_directory.yml", "test/fixtures/api/remove_account_from_group_twice.yml", "test/fixtures/api/remove_inexistente_account_from_group.yml", "test/fixtures/api/rules_for_domain.yml", "test/fixtures/api/rules_for_domain_by_component.yml", "test/fixtures/api/save_group.yml", "test/fixtures/api/test_domain.yml", "test/fixtures/api/update_account_properties.yml", "test/fixtures/api/update_accounts_group_scope.yml", "test/fixtures/api/update_accounts_properties_scope.yml", "test/fixtures/api/update_directory.yml", "test/fixtures/api/update_rule.yml", "test/helper.rb", "test/test_directories.rb", "test/test_dto.rb", "test/test_groups.rb", "test/test_mxhero_api.rb", "test/test_mxhero_api_response.rb"]
+  s.files = [".gitignore", ".rvmrc", "Gemfile", "LICENSE.txt", "README.md", "Rakefile", "VERSION", "lib/communication.rb", "lib/directories.rb", "lib/dto.rb", "lib/groups.rb", "lib/mxhero-api.rb", "lib/resource.rb", "lib/resources/account.rb", "lib/resources/domain.rb", "lib/resources/group.rb", "lib/urls.rb", "mxhero-api.gemspec", "test/fixtures/api/account_properties.yml", "test/fixtures/api/account_properties_not_found.yml", "test/fixtures/api/accounts.yml", "test/fixtures/api/accounts_filtered.yml", "test/fixtures/api/accounts_from_domain.yml", "test/fixtures/api/accounts_from_domain_paginated.yml", "test/fixtures/api/accounts_without_group.yml", "test/fixtures/api/add_an_inexistent_account_to_group.yml", "test/fixtures/api/add_and_remove_account.yml", "test/fixtures/api/all_groups.yml", "test/fixtures/api/create_directory.yml", "test/fixtures/api/create_rule_for_domain.yml", "test/fixtures/api/delete_directory.yml", "test/fixtures/api/delete_group.yml", "test/fixtures/api/delete_rule.yml", "test/fixtures/api/domain_by_id.yml", "test/fixtures/api/domain_by_id_not_found.yml", "test/fixtures/api/domain_rule.yml", "test/fixtures/api/domains.yml", "test/fixtures/api/fetch_directory.yml", "test/fixtures/api/ldap_info.yml", "test/fixtures/api/move_to_trial.yml", "test/fixtures/api/refresh_directory.yml", "test/fixtures/api/remove_account_from_group_twice.yml", "test/fixtures/api/remove_inexistente_account_from_group.yml", "test/fixtures/api/rules_for_domain.yml", "test/fixtures/api/rules_for_domain_by_component.yml", "test/fixtures/api/save_group.yml", "test/fixtures/api/test_domain.yml", "test/fixtures/api/update_account_properties.yml", "test/fixtures/api/update_accounts_group_scope.yml", "test/fixtures/api/update_accounts_properties_scope.yml", "test/fixtures/api/update_directory.yml", "test/fixtures/api/update_rule.yml", "test/fixtures/domain.rb", "test/helper.rb", "test/test_directories.rb", "test/test_domain.rb", "test/test_dto.rb", "test/test_feature.rb", "test/test_groups.rb", "test/test_mxhero_api.rb", "test/test_mxhero_api_response.rb", "test/test_resource.rb"]
   s.homepage = "http://github.com/mxhero/mxhero-api"
   s.licenses = ["GPL-3"]
   s.require_paths = ["lib"]
   s.rubygems_version = "2.1.9"
   s.summary = "A MxHero API client for ruby"
-  s.test_files = ["test/fixtures/api/account_properties.yml", "test/fixtures/api/account_properties_not_found.yml", "test/fixtures/api/accounts.yml", "test/fixtures/api/accounts_filtered.yml", "test/fixtures/api/accounts_from_domain.yml", "test/fixtures/api/accounts_from_domain_paginated.yml", "test/fixtures/api/accounts_without_group.yml", "test/fixtures/api/add_an_inexistent_account_to_group.yml", "test/fixtures/api/add_and_remove_account.yml", "test/fixtures/api/all_groups.yml", "test/fixtures/api/create_directory.yml", "test/fixtures/api/create_rule_for_domain.yml", "test/fixtures/api/delete_directory.yml", "test/fixtures/api/delete_group.yml", "test/fixtures/api/delete_rule.yml", "test/fixtures/api/domain_by_id.yml", "test/fixtures/api/domain_by_id_not_found.yml", "test/fixtures/api/domain_rule.yml", "test/fixtures/api/domains.yml", "test/fixtures/api/fetch_directory.yml", "test/fixtures/api/ldap_info.yml", "test/fixtures/api/refresh_directory.yml", "test/fixtures/api/remove_account_from_group_twice.yml", "test/fixtures/api/remove_inexistente_account_from_group.yml", "test/fixtures/api/rules_for_domain.yml", "test/fixtures/api/rules_for_domain_by_component.yml", "test/fixtures/api/save_group.yml", "test/fixtures/api/test_domain.yml", "test/fixtures/api/update_account_properties.yml", "test/fixtures/api/update_accounts_group_scope.yml", "test/fixtures/api/update_accounts_properties_scope.yml", "test/fixtures/api/update_directory.yml", "test/fixtures/api/update_rule.yml", "test/helper.rb", "test/test_directories.rb", "test/test_dto.rb", "test/test_groups.rb", "test/test_mxhero_api.rb", "test/test_mxhero_api_response.rb"]
+  s.test_files = ["test/fixtures/api/account_properties.yml", "test/fixtures/api/account_properties_not_found.yml", "test/fixtures/api/accounts.yml", "test/fixtures/api/accounts_filtered.yml", "test/fixtures/api/accounts_from_domain.yml", "test/fixtures/api/accounts_from_domain_paginated.yml", "test/fixtures/api/accounts_without_group.yml", "test/fixtures/api/add_an_inexistent_account_to_group.yml", "test/fixtures/api/add_and_remove_account.yml", "test/fixtures/api/all_groups.yml", "test/fixtures/api/create_directory.yml", "test/fixtures/api/create_rule_for_domain.yml", "test/fixtures/api/delete_directory.yml", "test/fixtures/api/delete_group.yml", "test/fixtures/api/delete_rule.yml", "test/fixtures/api/domain_by_id.yml", "test/fixtures/api/domain_by_id_not_found.yml", "test/fixtures/api/domain_rule.yml", "test/fixtures/api/domains.yml", "test/fixtures/api/fetch_directory.yml", "test/fixtures/api/ldap_info.yml", "test/fixtures/api/move_to_trial.yml", "test/fixtures/api/refresh_directory.yml", "test/fixtures/api/remove_account_from_group_twice.yml", "test/fixtures/api/remove_inexistente_account_from_group.yml", "test/fixtures/api/rules_for_domain.yml", "test/fixtures/api/rules_for_domain_by_component.yml", "test/fixtures/api/save_group.yml", "test/fixtures/api/test_domain.yml", "test/fixtures/api/update_account_properties.yml", "test/fixtures/api/update_accounts_group_scope.yml", "test/fixtures/api/update_accounts_properties_scope.yml", "test/fixtures/api/update_directory.yml", "test/fixtures/api/update_rule.yml", "test/fixtures/domain.rb", "test/helper.rb", "test/test_directories.rb", "test/test_domain.rb", "test/test_dto.rb", "test/test_feature.rb", "test/test_groups.rb", "test/test_mxhero_api.rb", "test/test_mxhero_api_response.rb", "test/test_resource.rb"]
 
   if s.respond_to? :specification_version then
     s.specification_version = 4

data/test/fixtures/api/move_to_trial.yml

@@ -0,0 +1,39 @@
+---
+http_interactions:
+- request:
+    method: put
+    uri: http://admin:password@test.mxhero.com/webapi/api/v1/domains/mxhero.com//cos/trial
+    body:
+      encoding: US-ASCII
+      string: ''
+    headers:
+      Accept:
+      - application/json
+      Content-Type:
+      - application/json
+      Authorization:
+      - Basic YWRtaW46cGFzc3dvcmQ=
+  response:
+    status:
+      code: 200
+      message: !binary |-
+        T0s=
+    headers:
+      !binary "RGF0ZQ==":
+      - !binary |-
+        VGh1LCAyNiBEZWMgMjAxMyAxOToxNTo0NCBHTVQ=
+      !binary "U2VydmVy":
+      - !binary |-
+        QXBhY2hlLzIuMi4xNCAoVWJ1bnR1KQ==
+      !binary "Q29udGVudC1MZW5ndGg=":
+      - !binary |-
+        MA==
+      !binary "Q29udGVudC1UeXBl":
+      - !binary |-
+        dGV4dC9wbGFpbg==
+    body:
+      encoding: US-ASCII
+      string: ''
+    http_version: 
+  recorded_at: Thu, 26 Dec 2013 19:15:44 GMT
+recorded_with: VCR 2.5.0

data/test/fixtures/api/test_domain.yml

@@ -21,7 +21,7 @@ http_interactions:
     headers:
       !binary "RGF0ZQ==":
       - !binary |-
-        RnJpLCAxOCBPY3QgMjAxMyAxOTo1MToyNSBHTVQ=
+        VHVlLCAxNyBEZWMgMjAxMyAxOTozMTozMiBHTVQ=
       !binary "U2VydmVy":
       - !binary |-
         QXBhY2hlLzIuMi4xNCAoVWJ1bnR1KQ==
@@ -33,9 +33,9 @@ http_interactions:
         YXBwbGljYXRpb24vanNvbg==
     body:
       encoding: US-ASCII
-      string: ! '{"domain":"mxhero.com","server":"gmail.mxhero.com","creationDate":1371220326000,"updatedDate":1375909534000,"aliases":["hero.mx","mxhero.com","mxhero.net","mxhero.org"],"ldap":null}'
+      string: ! '{"domain":"mxhero.com","server":"aspmx.l.google.com","relayServer":null,"inbound":true,"outbound":true,"creationDate":1371737853000,"updatedDate":1371741047000,"aliases":["hero.mx","mxhero.com","mxhero.net","mxhero.org"],"ldap":null,"features":[{"feature":"org.mxhero.feature.signature","created":1387296659000,"updated":null,"metadata":null,"maxRulesAmount":0}],"cos":{"cos":"test","edition":null},"cosLastChange":1387303649000}'
     http_version: 
-  recorded_at: Fri, 18 Oct 2013 19:51:25 GMT
+  recorded_at: Tue, 17 Dec 2013 19:31:32 GMT
 - request:
     method: get
     uri: http://admin:password@test.mxhero.com/webapi/api/v1/domains/xxxx.xxx/
@@ -57,7 +57,7 @@ http_interactions:
     headers:
       !binary "RGF0ZQ==":
       - !binary |-
-        RnJpLCAxOCBPY3QgMjAxMyAxOTo1MToyNiBHTVQ=
+        VHVlLCAxNyBEZWMgMjAxMyAxOTozMTozMyBHTVQ=
       !binary "U2VydmVy":
       - !binary |-
         QXBhY2hlLzIuMi4xNCAoVWJ1bnR1KQ==
@@ -71,5 +71,5 @@ http_interactions:
       encoding: US-ASCII
       string: ! '{"status":404,"code":404,"message":"domain.not.found","developerMessage":"domain.not.found","moreInfoUrl":"mailto:support@mxhero.com"}'
     http_version: 
-  recorded_at: Fri, 18 Oct 2013 19:51:26 GMT
+  recorded_at: Tue, 17 Dec 2013 19:31:52 GMT
 recorded_with: VCR 2.5.0

data/test/fixtures/domain.rb

@@ -0,0 +1,29 @@
+module Fixtures
+  module Domain
+  
+    def self.data 
+      @data ||= {
+        domain: "mxhero.com",
+        server: "aspmx.l.google.com",
+        relayServer: nil,
+        inbound: true, outbound: true,
+        creationDate: 1371737853000,
+        updatedDate: 1371741047000,
+        aliases: [ "hero.mx", "mxhero.com", "mxhero.net", "mxhero.org" ],
+        ldap: nil,
+        features: [
+          {
+            feature: "org.mxhero.feature.signature",
+            created: 1387296659000,
+            updated: nil,
+            metadata: nil,
+            maxRulesAmount: 2
+          }
+        ],
+        cos: { cos: "trial", edition: nil },
+        cosLastChange: 1387303649000
+      }
+    end
+
+  end
+end

data/test/helper.rb

@@ -9,6 +9,9 @@ require 'minitest/pride'
 
 require_relative '../lib/mxhero-api'
 
+# Load fixtures
+Dir["#{File.dirname(__FILE__)}/fixtures/**/*.rb"].each { |rb| require rb }
+
 TEST_API_DOMAIN   = 'tesla.com'
 TEST_API_URL      = ENV['TEST_API_URL'] || 'http://test.mxhero.com/webapi/api/v1'
 TEST_API_USER     = 'admin'

data/test/test_domain.rb

@@ -0,0 +1,29 @@
+require_relative 'helper'
+
+class DomainTest < MiniTest::Unit::TestCase
+
+  def test_build_domain
+    domain = MxHero::API::Domain.new data
+    assert_equal data[:domain], domain.domain
+    assert_equal data[:features].first[:feature], domain.features.first.component
+    assert_equal DateTime.strptime(data[:cosLastChange].to_s, '%Q'), domain.cos_last_change
+    assert domain.cos.is_a? MxHero::API::Cos
+    assert_equal data[:cos][:cos], domain.cos.type
+  end
+
+  def test_change_domain_to_trial
+    domain = MxHero::API::Domain.new data
+    domain.change_to_trial
+    assert_equal 'trial', domain.cos.type
+
+    domain = MxHero::API::Domain.new data.merge(cos: { cos: "post_trial", edition: nil })
+    domain.change_to_trial
+    assert_equal 'post_trial', domain.cos.type
+  end
+
+  def data 
+    Fixtures::Domain.data
+  end
+
+end
+

data/test/test_feature.rb

@@ -0,0 +1,34 @@
+require_relative 'helper'
+
+class FeatureTest < MiniTest::Unit::TestCase
+
+  def test_build_feature_domain
+    feature = MxHero::API::Feature.new data
+    assert_equal data[:feature], feature.component
+    assert_nil feature.updated 
+    assert_equal data[:maxRulesAmount], feature.max_rules_amount
+    assert ! feature.unlimited_use?
+  end
+
+  def test_unlimited_use
+    feature = MxHero::API::Feature.new data
+    assert feature.max_rules_amount > 0
+    assert ! feature.unlimited_use?
+
+    unlimited_use = data.dup
+    unlimited_use[:maxRulesAmount] = 0
+    feature = MxHero::API::Feature.new unlimited_use
+    assert_equal Float::INFINITY, feature.max_rules_amount
+    assert feature.unlimited_use?
+
+    unlimited_use[:maxRulesAmount] = nil
+    feature = MxHero::API::Feature.new unlimited_use
+    assert_equal Float::INFINITY, feature.max_rules_amount
+    assert feature.unlimited_use?
+  end
+
+  def data
+    Fixtures::Domain.data[:features].first
+  end
+
+end

data/test/test_mxhero_api.rb

@@ -231,11 +231,6 @@ def test_domain_by_name
   def test_domain
     VCR.use_cassette('test_domain') do
       domain = @api.domain('mxhero.com')
-      assert domain.key?(:domain)
-      assert domain.key?(:server)
-      assert domain.key?(:creationDate)
-      assert domain.key?(:aliases)
-      assert domain.key?(:ldap)
 
       response = @api.domain('xxxx.xxx')
       assert response.nil?
@@ -276,6 +271,13 @@ def test_domain_by_name
     end
   end
 
+  def test_move_to_trial
+    VCR.use_cassette('move_to_trial') do
+      response = @api.move_to_trial('mxhero.com')
+      assert response
+    end
+  end
+
   private
   
   def delete_all_rules

data/test/test_resource.rb

@@ -0,0 +1,59 @@
+require_relative 'helper'
+
+module Test
+  class User < MxHero::API::Resource
+
+    attribute :name, map: 'firstName'
+    attribute :last_name, map: 'lastName'
+    attribute :age
+    attribute :last_update, map: 'lastUpdate', date: true
+  end
+
+  class Account < MxHero::API::Resource
+    attributes :name, :number, :active
+    
+    attribute :name, map: 'accountName'
+    attribute :number, map: 'sn'
+    attribute :updated, date: true
+  end
+end
+
+class ResourceTest < MiniTest::Unit::TestCase
+
+  def info
+    @info ||= {
+      age: 23,
+      firstName: 'John',
+      lastName: 'Doe',
+      lastUpdate: "1371741047000"
+    }
+  end
+
+  def test_instance
+    user = Test::User.new info
+
+    assert_equal 23, user.age
+    assert_equal 'John', user.name
+    assert_equal 'Doe', user.last_name
+    assert_equal DateTime.strptime(info[:lastUpdate].to_s, '%Q'), user.last_update
+  end
+
+  def test_to_json
+    user = Test::User.new info
+    assert_equal info.to_json, user.to_json
+  end
+
+  def test_attributes_and_map
+    data = {
+      accountName: 'account 12',
+      sn: 1234567890,
+      active: true,
+      updated: 1371741047000
+    }
+    account = Test::Account.new data
+
+    assert_equal data[:accountName], account.name
+
+  end
+
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mxhero-api
 version: !ruby/object:Gem::Version
-  version: 0.1.24
+  version: 0.1.25
 platform: ruby
 authors:
 - Maximiliano Dello Russo
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-10 00:00:00.000000000 Z
+date: 2013-12-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: vcr
@@ -75,6 +75,10 @@ files:
 - lib/dto.rb
 - lib/groups.rb
 - lib/mxhero-api.rb
+- lib/resource.rb
+- lib/resources/account.rb
+- lib/resources/domain.rb
+- lib/resources/group.rb
 - lib/urls.rb
 - mxhero-api.gemspec
 - test/fixtures/api/account_properties.yml
@@ -98,6 +102,7 @@ files:
 - test/fixtures/api/domains.yml
 - test/fixtures/api/fetch_directory.yml
 - test/fixtures/api/ldap_info.yml
+- test/fixtures/api/move_to_trial.yml
 - test/fixtures/api/refresh_directory.yml
 - test/fixtures/api/remove_account_from_group_twice.yml
 - test/fixtures/api/remove_inexistente_account_from_group.yml
@@ -110,12 +115,16 @@ files:
 - test/fixtures/api/update_accounts_properties_scope.yml
 - test/fixtures/api/update_directory.yml
 - test/fixtures/api/update_rule.yml
+- test/fixtures/domain.rb
 - test/helper.rb
 - test/test_directories.rb
+- test/test_domain.rb
 - test/test_dto.rb
+- test/test_feature.rb
 - test/test_groups.rb
 - test/test_mxhero_api.rb
 - test/test_mxhero_api_response.rb
+- test/test_resource.rb
 homepage: http://github.com/mxhero/mxhero-api
 licenses:
 - GPL-3
@@ -162,6 +171,7 @@ test_files:
 - test/fixtures/api/domains.yml
 - test/fixtures/api/fetch_directory.yml
 - test/fixtures/api/ldap_info.yml
+- test/fixtures/api/move_to_trial.yml
 - test/fixtures/api/refresh_directory.yml
 - test/fixtures/api/remove_account_from_group_twice.yml
 - test/fixtures/api/remove_inexistente_account_from_group.yml
@@ -174,10 +184,14 @@ test_files:
 - test/fixtures/api/update_accounts_properties_scope.yml
 - test/fixtures/api/update_directory.yml
 - test/fixtures/api/update_rule.yml
+- test/fixtures/domain.rb
 - test/helper.rb
 - test/test_directories.rb
+- test/test_domain.rb
 - test/test_dto.rb
+- test/test_feature.rb
 - test/test_groups.rb
 - test/test_mxhero_api.rb
 - test/test_mxhero_api_response.rb
+- test/test_resource.rb
 has_rdoc: