metaforce 0.4.0 → 0.4.1

data/README.md

@@ -53,6 +53,10 @@ feature on a new branch, then send me a pull request with a detailed
 description. Please provide applicable rspec specs.
 
 ## Version History
+**0.4.1** (March 8, 2012)
+
+* Bug fixes
+
 **0.4.0** (March 2, 2012)
 
 * Various bug fixes and improvements.

data/lib/metaforce/manifest.rb

@@ -3,7 +3,6 @@ require 'metaforce/types'
 
 module Metaforce
   class Manifest
-    SFDC_API_VERSION = "23.0"
 
     # Initializes a new instance of a manifest (package.xml) file.
     # 
@@ -90,7 +89,7 @@ module Metaforce
         folder = parts[0]
         file = parts[1].gsub(/.*\//, '').gsub(/\..*/, '')
         components.each_key do |type|
-          if component_folder(type) =~ /#{folder}/i
+          if Metaforce::Metadata::Types.folder(type) =~ /#{folder}/i
             unless components[type].index(file).nil?
               self.add(type, file);
             end
@@ -100,23 +99,6 @@ module Metaforce
       self
     end
 
-    # Returns the components name
-    def component_name(key) # :nodoc:
-      METADATA_TYPES[key][:name]
-    end
-
-    # Returns the components folder
-    def component_folder(key) # :nodoc:
-      METADATA_TYPES[key][:folder]
-    end
-
-    # Returns a key for the component name
-    def component_key(name) # :nodoc:
-      METADATA_TYPES.each do |key, component|
-        return key if component[:name] == name
-      end
-    end
-
     # Returns a string containing a package.xml file
     #
     #  <?xml version="1.0"?>
@@ -144,10 +126,10 @@ module Metaforce
               members.each do |member|
                 xml.members member
               end
-              xml.name component_name(key)
+              xml.name Metaforce::Metadata::Types.name(key)
             }
           end
-          xml.version SFDC_API_VERSION
+          xml.version Metaforce.configuration.api_version
         }
       end
       xml_builder.to_xml
@@ -172,7 +154,7 @@ module Metaforce
     def to_package
       components = []
       @components.each do |type, members|
-        name = component_name(type)
+        name = Metaforce::Metadata::Types.name(type)
         components.push :members => members, :name => name
       end
       components
@@ -183,7 +165,7 @@ module Metaforce
       document = Nokogiri::XML(file).remove_namespaces!
       document.xpath('//types').each do |type|
         name = type.xpath('name').first.content
-        key = component_key(name);
+        key = Metaforce::Metadata::Types.key(name);
         type.xpath('members').each do |member|
           if @components[key].is_a?(Array)
             @components[key].push(member.content)

data/lib/metaforce/metadata/client.rb

@@ -50,6 +50,7 @@ module Metaforce
             :queries => queries
           }
         end
+        return [] unless response.body[:list_metadata_response]
         response.body[:list_metadata_response][:result]
       end
 
@@ -64,7 +65,7 @@ module Metaforce
       #   # List the names of all custom objects
       #   client.list_custom_objects.collect { |t| t[:full_name] }
       #   #=> ["Asset", "estore__Ida_Menu_Item__c", "SfoMatchHistoryItem", ... ]
-      METADATA_TYPES.each do |type, value|
+      Metaforce::Metadata::Types.all.each do |type, value|
         define_method("list_#{value[:plural]}".to_sym) do
           list :type => value[:name]
         end

data/lib/metaforce/rake.rb

@@ -34,6 +34,7 @@ module Metaforce
           print "username: "; @username = STDIN.gets.chomp
           print "password: "; @password = STDIN.gets.chomp
           print "security token: "; @security_token = STDIN.gets.chomp
+          Metaforce.log = true
         end
       end
 

data/lib/metaforce/types.rb

@@ -1,214 +1,244 @@
 module Metaforce
-  METADATA_TYPES = {
-    :action_override => {
-      :name => "ActionOverride",
-      :folder => "objects",
-      :plural => :action_overrides
-    },
-    :analytics_snapshot => {
-      :name => "AnalyticsSnapshot",
-      :folder => "analyticsnapshots",
-      :plural => :analytics_snapshots
-    },
-    :apex_class => {
-      :name => "ApexClass",
-      :folder => "classes",
-      :plural => :apex_classes
-    },
-    :article_type => {
-      :name => "ArticleType",
-      :folder => "objects",
-      :plural => :article_types
-    },
-    :apex_component => {
-      :name => "ApexComponent",
-      :folder => "components",
-      :plural => :apex_components
-    },
-    :apex_page => {
-      :name => "ApexPage",
-      :folder => "pages",
-      :plural => :apex_pages
-    },
-    :apex_trigger => {
-      :name => "ApexTrigger",
-      :folder => "triggers",
-      :plural => :apex_triggers
-    },
-    :business_process => {
-      :name => "BusinessProcess",
-      :folder => "objects",
-      :plural => :business_processes
-    },
-    :custom_application => {
-      :name => "CustomApplication",
-      :folder => "applications",
-      :plural => :custom_applications
-    },
-    :custom_field => {
-      :name => "CustomField",
-      :folder => "objects",
-      :plural => :custom_fields
-    },
-    :custom_labels => {
-      :name => "CustomLabels",
-      :folder => "labels",
-      :plural => :custom_labels
-    },
-    :custom_object => {
-      :name => "CustomObject",
-      :folder => "objects",
-      :plural => :custom_objects
-    },
-    :custom_object_translation => {
-      :name => "CustomObjectTranslation",
-      :folder => "objectTranslations",
-      :plural => :custom_object_translations
-    },
-    :custom_page_web_link => {
-      :name => "CustomPageWebLink",
-      :folder => "weblinks",
-      :plural => :custom_page_web_links
-    },
-    :custom_site => {
-      :name => "CustomSite",
-      :folder => "sites",
-      :plural => :custom_sites
-    },
-    :custom_tab => {
-      :name => "CustomTab",
-      :folder => "tabs",
-      :plural => :custom_tabs
-    },
-    :dashboard => {
-      :name => "Dashboard",
-      :folder => "dashboards",
-      :plural => :dashboards
-    },
-    :data_category_group => {
-      :name => "DataCategoryGroup",
-      :folder => "datacategorygroups",
-      :plural => :data_category_groups
-    },
-    :document => {
-      :name => "Document",
-      :folder => "document",
-      :plural => :documents
-    },
-    :email_template => {
-      :name => "EmailTemplate",
-      :folder => "email",
-      :plural => :email_templates
-    },
-    :entitlement_template => {
-      :name => "EntitlementTemplate",
-      :folder => "entitlementTemplates",
-      :plural => :entitlement_templates
-    },
-    :field_set => {
-      :name => "FieldSet",
-      :folder => "objects",
-      :plural => :field_sets
-    },
-    :home_page_component => {
-      :name => "HomePageComponent",
-      :folder => "homePageComponents",
-      :plural => :home_page_components
-    },
-    :layout => {
-      :name => "Layout",
-      :folder => "layouts",
-      :plural => :layouts
-    },
-    :letterhead => {
-      :name => "Letterhead",
-      :folder => "letterhead",
-      :plural => :letterheads
-    },
-    :list_view => {
-      :name => "ListView",
-      :folder => "objects",
-      :plural => :list_views
-    },
-    :named_filter => {
-      :name => "NamedFilter",
-      :folder => "objects",
-      :plural => :named_filters
-    },
-    :permission_set => {
-      :name => "PermissionSet",
-      :folder => "permissionsets",
-      :plural => :permission_sets
-    },
-    :portal => {
-      :name => "Portal",
-      :folder => "portals",
-      :plural => :portals
-    },
-    :profile => {
-      :name => "Profile",
-      :folder => "profiles",
-      :plural => :profiles
-    },
-    :record_type => {
-      :name => "RecordType",
-      :folder => "objects",
-      :plural => :record_types
-    },
-    :remote_site_setting => {
-      :name => "RemoteSiteSetting",
-      :folder => "remoteSiteSettings",
-      :plural => :remote_site_settings
-    },
-    :report => {
-      :name => "Report",
-      :folder => "reports",
-      :plural => :reports
-    },
-    :report_type => {
-      :name => "ReportType",
-      :folder => "reportTypes",
-      :plural => :report_types
-    },
-    :scontroler => {
-      :name => "Scontroler",
-      :folder => "scontrols",
-      :plural => :scontrolers
-    },
-    :sharing_reason => {
-      :name => "SharingReason",
-      :folder => "objects",
-      :plural => :sharing_reasons
-    },
-    :sharing_recalculation => {
-      :name => "SharingRecalculation",
-      :folder => "objects",
-      :plural => :sharing_recalculations
-    },
-    :static_resource => {
-      :name => "StaticResource",
-      :folder => "staticResources",
-      :plural => :static_resources
-    },
-    :translations => {
-      :name => "Translations",
-      :folder => "translations",
-      :plural => :translations
-    },
-    :validation_rule => {
-      :name => "ValidationRule",
-      :folder => "objects",
-      :plural => :validation_rules
-    },
-    :weblink => {
-      :name => "Weblink",
-      :folder => "objects",
-      :plural => :weblinks
-    },
-    :workflow => {
-      :name => "Workflow",
-      :folder => "workflows",
-      :plural => :workflows
-    }
-  }
+  module Metadata
+    class Types
+
+      def self.name(key)
+        METADATA_TYPES[key][:name]
+      end
+
+      def self.folder(key)
+        METADATA_TYPES[key][:folder]
+      end
+
+      def self.key(name)
+        METADATA_TYPES.each do |key, component|
+          return key if component[:name] == name
+        end
+      end
+
+      def self.all
+        METADATA_TYPES
+      end
+
+      def [](key)
+        METADATA_TYPES[key]
+      end
+
+    private
+    
+      METADATA_TYPES = {
+        :action_override => {
+          :name => "ActionOverride",
+          :folder => "objects",
+          :plural => :action_overrides
+        },
+        :analytics_snapshot => {
+          :name => "AnalyticsSnapshot",
+          :folder => "analyticsnapshots",
+          :plural => :analytics_snapshots
+        },
+        :apex_class => {
+          :name => "ApexClass",
+          :folder => "classes",
+          :plural => :apex_classes
+        },
+        :article_type => {
+          :name => "ArticleType",
+          :folder => "objects",
+          :plural => :article_types
+        },
+        :apex_component => {
+          :name => "ApexComponent",
+          :folder => "components",
+          :plural => :apex_components
+        },
+        :apex_page => {
+          :name => "ApexPage",
+          :folder => "pages",
+          :plural => :apex_pages
+        },
+        :apex_trigger => {
+          :name => "ApexTrigger",
+          :folder => "triggers",
+          :plural => :apex_triggers
+        },
+        :business_process => {
+          :name => "BusinessProcess",
+          :folder => "objects",
+          :plural => :business_processes
+        },
+        :custom_application => {
+          :name => "CustomApplication",
+          :folder => "applications",
+          :plural => :custom_applications
+        },
+        :custom_field => {
+          :name => "CustomField",
+          :folder => "objects",
+          :plural => :custom_fields
+        },
+        :custom_labels => {
+          :name => "CustomLabels",
+          :folder => "labels",
+          :plural => :custom_labels
+        },
+        :custom_object => {
+          :name => "CustomObject",
+          :folder => "objects",
+          :plural => :custom_objects
+        },
+        :custom_object_translation => {
+          :name => "CustomObjectTranslation",
+          :folder => "objectTranslations",
+          :plural => :custom_object_translations
+        },
+        :custom_page_web_link => {
+          :name => "CustomPageWebLink",
+          :folder => "weblinks",
+          :plural => :custom_page_web_links
+        },
+        :custom_site => {
+          :name => "CustomSite",
+          :folder => "sites",
+          :plural => :custom_sites
+        },
+        :custom_tab => {
+          :name => "CustomTab",
+          :folder => "tabs",
+          :plural => :custom_tabs
+        },
+        :dashboard => {
+          :name => "Dashboard",
+          :folder => "dashboards",
+          :plural => :dashboards
+        },
+        :data_category_group => {
+          :name => "DataCategoryGroup",
+          :folder => "datacategorygroups",
+          :plural => :data_category_groups
+        },
+        :document => {
+          :name => "Document",
+          :folder => "document",
+          :plural => :documents
+        },
+        :email_template => {
+          :name => "EmailTemplate",
+          :folder => "email",
+          :plural => :email_templates
+        },
+        :entitlement_template => {
+          :name => "EntitlementTemplate",
+          :folder => "entitlementTemplates",
+          :plural => :entitlement_templates
+        },
+        :field_set => {
+          :name => "FieldSet",
+          :folder => "objects",
+          :plural => :field_sets
+        },
+        :home_page_component => {
+          :name => "HomePageComponent",
+          :folder => "homePageComponents",
+          :plural => :home_page_components
+        },
+        :layout => {
+          :name => "Layout",
+          :folder => "layouts",
+          :plural => :layouts
+        },
+        :letterhead => {
+          :name => "Letterhead",
+          :folder => "letterhead",
+          :plural => :letterheads
+        },
+        :list_view => {
+          :name => "ListView",
+          :folder => "objects",
+          :plural => :list_views
+        },
+        :named_filter => {
+          :name => "NamedFilter",
+          :folder => "objects",
+          :plural => :named_filters
+        },
+        :permission_set => {
+          :name => "PermissionSet",
+          :folder => "permissionsets",
+          :plural => :permission_sets
+        },
+        :portal => {
+          :name => "Portal",
+          :folder => "portals",
+          :plural => :portals
+        },
+        :profile => {
+          :name => "Profile",
+          :folder => "profiles",
+          :plural => :profiles
+        },
+        :record_type => {
+          :name => "RecordType",
+          :folder => "objects",
+          :plural => :record_types
+        },
+        :remote_site_setting => {
+          :name => "RemoteSiteSetting",
+          :folder => "remoteSiteSettings",
+          :plural => :remote_site_settings
+        },
+        :report => {
+          :name => "Report",
+          :folder => "reports",
+          :plural => :reports
+        },
+        :report_type => {
+          :name => "ReportType",
+          :folder => "reportTypes",
+          :plural => :report_types
+        },
+        :scontroler => {
+          :name => "Scontroler",
+          :folder => "scontrols",
+          :plural => :scontrolers
+        },
+        :sharing_reason => {
+          :name => "SharingReason",
+          :folder => "objects",
+          :plural => :sharing_reasons
+        },
+        :sharing_recalculation => {
+          :name => "SharingRecalculation",
+          :folder => "objects",
+          :plural => :sharing_recalculations
+        },
+        :static_resource => {
+          :name => "StaticResource",
+          :folder => "staticResources",
+          :plural => :static_resources
+        },
+        :translations => {
+          :name => "Translations",
+          :folder => "translations",
+          :plural => :translations
+        },
+        :validation_rule => {
+          :name => "ValidationRule",
+          :folder => "objects",
+          :plural => :validation_rules
+        },
+        :weblink => {
+          :name => "Weblink",
+          :folder => "objects",
+          :plural => :weblinks
+        },
+        :workflow => {
+          :name => "Workflow",
+          :folder => "workflows",
+          :plural => :workflows
+        }
+      }
+
+    end
+  end
 end

data/lib/metaforce/version.rb

@@ -1,3 +1,3 @@
 module Metaforce
-  VERSION = "0.4.0"
+  VERSION = "0.4.1"
 end

data/spec/fixtures/requests/list_metadata/no_result.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<soapenv:Envelope xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/" xmlns="http://soap.sforce.com/2006/04/metadata">
+  <soapenv:Body>
+    <listMetadataResponse/>
+  </soapenv:Body>
+</soapenv:Envelope>

data/spec/lib/metadata/metadata_spec.rb

@@ -18,10 +18,15 @@ describe Metaforce::Metadata::Client do
       client.list(:type => "ApexClass").should be_an(Array)
     end
 
+    it "returns an empty array when no results are returned" do
+      savon.expects(:list_metadata).with(:queries => [ :type => "ApexClass"]).returns(:no_result)
+      client.list(:type => "ApexClass").should be_an(Array)
+    end
+
   end
 
   it "should respond to dynamically defined list methods" do
-    Metaforce::METADATA_TYPES.each do |type, value|
+    Metaforce::Metadata::Types.all.each do |type, value|
       client.respond_to?("list_#{value[:plural]}").should eq(true)
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: metaforce
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-03-02 00:00:00.000000000 Z
+date: 2012-03-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
-  requirement: &2152167300 !ruby/object:Gem::Requirement
+  requirement: &2154344380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: 1.5.0
   type: :runtime
   prerelease: false
-  version_requirements: *2152167300
+  version_requirements: *2154344380
 - !ruby/object:Gem::Dependency
   name: savon
-  requirement: &2152166720 !ruby/object:Gem::Requirement
+  requirement: &2154343720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: 0.9.7
   type: :runtime
   prerelease: false
-  version_requirements: *2152166720
+  version_requirements: *2154343720
 - !ruby/object:Gem::Dependency
   name: rubyzip
-  requirement: &2152164880 !ruby/object:Gem::Requirement
+  requirement: &2154342540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: 0.9.5
   type: :runtime
   prerelease: false
-  version_requirements: *2152164880
+  version_requirements: *2154342540
 - !ruby/object:Gem::Dependency
   name: term-ansicolor
-  requirement: &2152180240 !ruby/object:Gem::Requirement
+  requirement: &2154342120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2152180240
+  version_requirements: *2154342120
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &2152176860 !ruby/object:Gem::Requirement
+  requirement: &2154341600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2152176860
+  version_requirements: *2154341600
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &2152175140 !ruby/object:Gem::Requirement
+  requirement: &2154341040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2152175140
+  version_requirements: *2154341040
 - !ruby/object:Gem::Dependency
   name: mocha
-  requirement: &2152188880 !ruby/object:Gem::Requirement
+  requirement: &2154356340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2152188880
+  version_requirements: *2154356340
 - !ruby/object:Gem::Dependency
   name: savon_spec
-  requirement: &2152186660 !ruby/object:Gem::Requirement
+  requirement: &2154355100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -98,7 +98,7 @@ dependencies:
         version: 0.1.6
   type: :development
   prerelease: false
-  version_requirements: *2152186660
+  version_requirements: *2154355100
 description: A Ruby gem for interacting with the Salesforce Metadata API
 email:
 - eric@ejholmes.net
@@ -139,6 +139,7 @@ files:
 - spec/fixtures/requests/check_status/not_done.xml
 - spec/fixtures/requests/deploy/in_progress.xml
 - spec/fixtures/requests/describe_metadata/success.xml
+- spec/fixtures/requests/list_metadata/no_result.xml
 - spec/fixtures/requests/list_metadata/objects.xml
 - spec/fixtures/requests/login/failure.xml
 - spec/fixtures/requests/login/success.xml
@@ -176,7 +177,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: metaforce
-rubygems_version: 1.8.15
+rubygems_version: 1.8.11
 signing_key: 
 specification_version: 3
 summary: A Ruby gem for interacting with the Salesforce Metadata API
@@ -189,6 +190,7 @@ test_files:
 - spec/fixtures/requests/check_status/not_done.xml
 - spec/fixtures/requests/deploy/in_progress.xml
 - spec/fixtures/requests/describe_metadata/success.xml
+- spec/fixtures/requests/list_metadata/no_result.xml
 - spec/fixtures/requests/list_metadata/objects.xml
 - spec/fixtures/requests/login/failure.xml
 - spec/fixtures/requests/login/success.xml