restfulx 1.2.5 → 1.3.0

data/test/rails/test_to_fxml.rb

@@ -1,35 +1,38 @@
 $:.unshift(File.dirname(__FILE__))
 
 require 'helpers/unit_test_helper'
-require 'models/location'
-require 'models/note'
-require 'models/project'
-require 'models/task'
-require 'models/user'
-require 'models/simple_property'
 
 class ToFxmlTest < ActiveRecord::TestCase
-  fixtures :locations, :notes, :projects, :tasks, :users, :simple_properties
+  fixtures :users
   
   def test_to_fxml_sanity
-    assert_nothing_raised {users(:ludwig).to_fxml}
+    assert_nothing_raised {users(:user_1).to_fxml}
   end
   
   def test_to_fxml_doesnt_dasherize
-    set_response_to users(:ludwig).to_fxml
-    assert_xml_select 'user first_name', 'Ludwig'    
+    set_response_to users(:user_1).to_fxml
+    assert_xml_select 'user first_name', 'Foo1'    
   end
   
   def test_default_xml_methods_on_user_are_included_in_fxml
-    set_response_to users(:ludwig).to_fxml(:methods => [:has_nothing_to_do, :full_name])
-    assert_xml_select 'user full_name', 'Ludwig van Beethoven'
+    set_response_to users(:user_1).to_fxml(:methods => [:has_nothing_to_do, :full_name])
+    assert_xml_select 'user full_name', 'Foo1 Bar1'
     assert_xml_select 'user has_nothing_to_do'
   end
   
   def test_default_xml_methods_on_user_are_included_in_fxml_if_you_call_it_twice
-    set_response_to users(:ludwig).to_fxml(:methods => [:has_nothing_to_do, :full_name])
-    set_response_to users(:ludwig).to_fxml(:methods => [:has_nothing_to_do, :full_name])
-    assert_xml_select 'user full_name', 'Ludwig van Beethoven'
+    set_response_to users(:user_1).to_fxml(:methods => [:has_nothing_to_do, :full_name])
+    set_response_to users(:user_1).to_fxml(:methods => [:has_nothing_to_do, :full_name])
+    assert_xml_select 'user full_name', 'Foo1 Bar1'
     assert_xml_select 'user has_nothing_to_do'
   end
+
+  # need to fix this
+  # def test_to_fxml_serializes_validation_errors
+  #   vince = users(:vincent)
+  #   assert_invalid vince
+  #   assert_not_nil vince.errors
+  #   set_response_to vince.errors.to_fxml
+  #   assert_xml_select 'errors error'
+  # end
 end

data/test/rails/test_to_json.rb

@@ -1,23 +1,11 @@
 $:.unshift(File.dirname(__FILE__))
 
 require 'helpers/unit_test_helper'
-require 'models/location'
-require 'models/note'
-require 'models/project'
-require 'models/task'
-require 'models/user'
-require 'models/simple_property'
 
 class ToJsonTest < ActiveRecord::TestCase
-  fixtures :locations, :notes, :projects, :tasks, :users, :simple_properties
+  fixtures :users
   
   def test_to_json_sanity
-    assert_nothing_raised {users(:ludwig).to_json}
-  end
-  
-  def test_to_json_methods
-    #set_response_to users(:ludwig).to_json
-    #puts users(:ludwig).to_json
-    puts User.all.to_json
+    assert_nothing_raised {users(:user_1).to_json}
   end
 end

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 1
-  - 2
-  - 5
-  version: 1.2.5
+  - 3
+  - 0
+  version: 1.3.0
 platform: ruby
 authors: 
 - Dima Berastau
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-07-02 00:00:00 -07:00
+date: 2010-09-27 00:00:00 +03:00
 default_executable: rx-gen
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -27,8 +27,8 @@ dependencies:
         segments: 
         - 1
         - 5
-        - 0
-        version: 1.5.0
+        - 2
+        version: 1.5.2
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
@@ -45,12 +45,12 @@ dependencies:
         version: 2.0.0
   type: :runtime
   version_requirements: *id002
-description: 
+description: "RestfulX: The RESTful Way to develop Adobe Flex and AIR applications"
 email: dima.berastau@gmail.com
 executables: 
 - rx-gen
-extensions: []
-
+extensions: 
+- ext/restfulx/ext/amf/serializer/extconf.rb
 extra_rdoc_files: 
 - README.rdoc
 files: 
@@ -85,18 +85,23 @@ files:
 - app_generators/rx_app/templates/swfobject.js
 - bin/rx-gen
 - lib/restfulx.rb
-- lib/restfulx/active_foo.rb
 - lib/restfulx/active_record_tasks.rb
 - lib/restfulx/active_record_uuid_helper.rb
+- lib/restfulx/amf.rb
+- lib/restfulx/amf/class_mapping.rb
+- lib/restfulx/amf/ext.rb
 - lib/restfulx/amf/ext/serializer.bundle
+- lib/restfulx/amf/pure.rb
+- lib/restfulx/amf/pure/io_helpers.rb
+- lib/restfulx/amf/pure/serializer.rb
 - lib/restfulx/configuration.rb
-- lib/restfulx/datamapper_foo.rb
-- lib/restfulx/rails/recipes.rb
-- lib/restfulx/rails/schema_to_yaml.rb
-- lib/restfulx/rails/schema_to_yaml/extensions/enumerable.rb
-- lib/restfulx/rails/schema_to_yaml/settings/config.rb
-- lib/restfulx/rails/schema_to_yaml/settings/core.rb
-- lib/restfulx/rails/swf_helper.rb
+- lib/restfulx/recipes.rb
+- lib/restfulx/rx_action_controller.rb
+- lib/restfulx/rx_active_record.rb
+- lib/restfulx/rx_active_support.rb
+- lib/restfulx/rx_datamapper.rb
+- lib/restfulx/schema_to_rx_yaml.rb
+- lib/restfulx/swf_helper.rb
 - lib/restfulx/tasks.rb
 - rails_generators/rx_config/USAGE
 - rails_generators/rx_config/rx_config_generator.rb
@@ -180,6 +185,7 @@ files:
 - test/rails/fixtures/tasks.yml
 - test/rails/fixtures/users.yml
 - test/rails/helpers/functional_test_helper.rb
+- test/rails/helpers/performance_test_helper.rb
 - test/rails/helpers/test_helper.rb
 - test/rails/helpers/unit_test_helper.rb
 - test/rails/model.yml
@@ -192,7 +198,9 @@ files:
 - test/rails/schema.rb
 - test/rails/test.swf
 - test/rails/test_active_foo.rb
-- test/rails/test_rails_integration_functional.rb
+- test/rails/test_notes_controller_functional.rb
+- test/rails/test_serialiazation_performance.rb
+- test/rails/test_to_amf.rb
 - test/rails/test_to_fxml.rb
 - test/rails/test_to_json.rb
 - test/rails/views/notes/empty_params_action.html.erb
@@ -237,6 +245,7 @@ test_files:
 - test/rails/controllers/tasks_controller.rb
 - test/rails/controllers/users_controller.rb
 - test/rails/helpers/functional_test_helper.rb
+- test/rails/helpers/performance_test_helper.rb
 - test/rails/helpers/test_helper.rb
 - test/rails/helpers/unit_test_helper.rb
 - test/rails/models/location.rb
@@ -247,6 +256,8 @@ test_files:
 - test/rails/models/user.rb
 - test/rails/schema.rb
 - test/rails/test_active_foo.rb
-- test/rails/test_rails_integration_functional.rb
+- test/rails/test_notes_controller_functional.rb
+- test/rails/test_serialiazation_performance.rb
+- test/rails/test_to_amf.rb
 - test/rails/test_to_fxml.rb
 - test/rails/test_to_json.rb

data/lib/restfulx/active_foo.rb

@@ -1,178 +0,0 @@
-# There's a number of things that ActiveRecord/ActiveSupport and the rest of the family get
-# ~wrong~ from the point of view of Flex clients.
-#
-# Some of these things are:
-# * XML format (Flex *really* doesn't like dashes in XML messages)
-# * Errors (we need to be more specific and communicate what went wrong *where*) 
-#
-# This is where we try to fix this stuff.
-#
-# Some of the things that are done can be called _monkey_ _patching_ while others can
-# be called extensions. Caveat emptor.
-
-# ActiveSupport specific patches. More specifically we add +to_fxml+ methods to Array and
-# Hash conversion modules
-module ActiveSupport
-  # refer to: http://api.rubyonrails.org/ for more details
-  module CoreExtensions
-    # Add Flex friendly +to_fxml+ to Hash conversions
-    module Hash
-      # refer to: http://api.rubyonrails.org/ for more details
-      module Conversions
-        
-        # Flex friendly XML format, no dashes, etc
-        def to_fxml(options = {})
-          options.merge!(:dasherize => false)
-          options[:indent] ||= 2
-          options.reverse_merge!({ :builder => Builder::XmlMarkup.new(:indent => options[:indent]),
-                                   :root => "hash" })
-          options[:builder].instruct! unless options.delete(:skip_instruct)
-          dasherize = !options.has_key?(:dasherize) || options[:dasherize]
-          root = dasherize ? options[:root].to_s.dasherize : options[:root].to_s
-
-          options[:builder].__send__(:method_missing, root) do
-            each do |key, value|
-              case value
-                when ::Hash
-                  value.to_fxml(options.merge({ :root => key, :skip_instruct => true }))
-                when ::Array
-                  value.to_fxml(options.merge({ :root => key, :children => key.to_s.singularize, :skip_instruct => true}))
-                when ::Method, ::Proc
-                  # If the Method or Proc takes two arguments, then
-                  # pass the suggested child element name.  This is
-                  # used if the Method or Proc will be operating over
-                  # multiple records and needs to create an containing
-                  # element that will contain the objects being
-                  # serialized.
-                  if 1 == value.arity
-                    value.call(options.merge({ :root => key, :skip_instruct => true }))
-                  else
-                    value.call(options.merge({ :root => key, :skip_instruct => true }), key.to_s.singularize)
-                  end
-                else
-                  if value.respond_to?(:to_fxml)
-                    value.to_fxml(options.merge({ :root => key, :skip_instruct => true }))
-                  else
-                    type_name = XML_TYPE_NAMES[value.class.name]
-
-                    key = dasherize ? key.to_s.dasherize : key.to_s
-
-                    attributes = options[:skip_types] || value.nil? || type_name.nil? ? { } : { :type => type_name }
-                    if value.nil?
-                      attributes[:nil] = true
-                    end
-
-                    options[:builder].tag!(key,
-                      XML_FORMATTING[type_name] ? XML_FORMATTING[type_name].call(value) : value,
-                      attributes
-                    )
-                end
-              end
-            end
-    
-            yield options[:builder] if block_given?
-          end
-        end
-      end
-    end
-    # Add Flex friendly to_fxml to array conversions
-    module Array
-      # refer to: http://api.rubyonrails.org/ for more details
-      module Conversions
-        # Flex friendly XML format (no dashes, etc)
-        def to_fxml(options = {})
-          raise "Not all elements respond to to_fxml" unless all? { |e| e.respond_to? :to_fxml }
-
-          options[:root]     ||= all? { |e| e.is_a?(first.class) && first.class.to_s != "Hash" } ? first.class.to_s.underscore.pluralize : "records"
-          options[:children] ||= options[:root].singularize
-          options[:indent]   ||= 2
-          options[:builder]  ||= Builder::XmlMarkup.new(:indent => options[:indent])
-          options.merge!(:dasherize => false)
-          
-          options[:attributes] ||= {}
-          options[:attributes].merge!(:type => "array")
-
-          root     = options.delete(:root).to_s
-          children = options.delete(:children)
-
-          if !options.has_key?(:dasherize) || options[:dasherize]
-            root = root.dasherize
-          end
-
-          options[:builder].instruct! unless options.delete(:skip_instruct)
-
-          opts = options.merge({ :root => children })
-
-          xml = options[:builder]
-          if empty?
-            xml.tag!(root, options[:attributes])
-          else
-            xml.tag!(root, options[:attributes]) {
-              yield xml if block_given?
-              each { |e| e.to_fxml(opts.merge!({ :skip_instruct => true })) }
-            }
-          end
-        end
-      end
-    end
-  end
-end
-
-# Flex friendly ActiveRecord patches. More specifically XML serialization improvements.
-# These won't override whatever you may normally do with XML, hence there's Flex specific
-# name for this stuff +to_fxml+.
-module ActiveRecord
-  # refer to: http://api.rubyonrails.org/ for more details
-  module Serialization
-    # Enforces Flex friendly options on XML and delegates processing to standard +to_xml+
-    def to_fxml(options = {}, &block)
-      options.merge!(:dasherize => false)
-      default_except = [:crypted_password, :salt, :remember_token, :remember_token_expires_at]
-      options[:except] = (options[:except] ? options[:except] + default_except : default_except)
-      to_xml(options, &block)
-    end
-  end
-  
-  # Change the xml serializer so that '?'s are stripped from attribute names.
-  # This makes it possible to serialize methods that end in a question mark, like 'valid?' or 'is_true?'
-  class XmlSerializer
-    # Strips '?' from serialized method names
-    def add_tag(attribute)
-      builder.tag!(
-        dasherize? ? attribute.display_name.dasherize : attribute.display_name,
-        attribute.value.to_s,
-        attribute.decorations(!options[:skip_types])
-      )
-    end
-    # Strips '?' from serialized method names
-    class Attribute
-      # Strips '?' from serialized method names
-      def display_name
-        @name.gsub('?','')
-      end
-    end
-  end
-
-  # Add more extensive reporting on errors including field name along with a message
-  # when errors are serialized to XML
-  class Errors
-    # Flex friendly errors
-    def to_fxml(options = {})
-      options[:root] ||= "errors"
-      options[:indent] ||= 2
-      options[:builder] ||= Builder::XmlMarkup.new(:indent => options[:indent])
-      options[:builder].instruct! unless options.delete(:skip_instruct)
-      options[:builder].errors do |e|
-        # The @errors instance variable is a Hash inside the Errors class
-        @errors.each do |attr, msg|
-          next if msg.nil?
-          if attr == "base"
-            options[:builder].error("message", msg.to_s)
-          else
-            options[:builder].error("field" => attr.camelcase(:lower), "message" => msg.to_s)
-          end
-        end
-      end
-    end  
-  end
-end

data/lib/restfulx/rails/schema_to_yaml/extensions/enumerable.rb

@@ -1,8 +0,0 @@
-# Enumerable extensions
-module Enumerable
-  # Helps you find duplicates
-  # used in schema_to_yaml.rb for cleanup
-  def dups
-    inject({}) {|h,v| h[v]=h[v].to_i+1; h}.reject{|k,v| v==1}.keys
-  end
-end

data/lib/restfulx/rails/schema_to_yaml/settings/config.rb

@@ -1,17 +0,0 @@
-# SchemaToYaml settings
-module SchemaToYaml
-  module Settings
-    class Config
-      class << self
-        def configure
-          yield self
-        end
-
-        def settings_file
-          @settings_file ||= :restfulx
-        end
-        attr_writer :settings_file
-      end
-    end
-  end
-end

data/lib/restfulx/rails/schema_to_yaml/settings/core.rb

@@ -1,73 +0,0 @@
-# Inspired from http://settingslogic.rubyforge.org/
-# Used to read in settings from restfulx.yml for use in code generation
-module SchemaToYaml
-  module Settings
-    # We try to figure out the application root using a number of possible options
-    APP_ROOT = defined?(RAILS_ROOT) ? RAILS_ROOT : defined?(Merb) ? Merb.root : File.expand_path(".")
-    
-    class Core
-      class << self
-        def name
-          instance._settings.key?("name") ? instance.name : super
-        end
-        
-        def reset!
-          @instance = nil
-        end
-        
-      private
-        def instance
-          @instance ||= new
-        end
-        
-        def method_missing(name, *args, &block)
-          instance.send(name, *args, &block)
-        end
-      end
-      
-      attr_accessor :_settings
-      
-      def initialize(name_or_hash = Config.settings_file)
-        case name_or_hash
-        when Hash
-          self._settings = name_or_hash
-        when String, Symbol
-          root_path = defined?(APP_ROOT) ? "#{APP_ROOT}/config/" : ""
-          file_path = name_or_hash.is_a?(Symbol) ? "#{root_path}#{name_or_hash}.yml" : name_or_hash
-          self._settings = YAML.load(ERB.new(File.read(file_path)).result)
-          self._settings = _settings[RAILS_ENV] if defined?(RAILS_ENV)
-        else
-          raise ArgumentError.new("Your settings must be a hash, 
-            a symbol representing the name of the .yml file in your config directory,
-            or a string representing the abosolute path to your settings file.")
-        end
-        define_settings!
-      end
-      
-    private
-      def method_missing(name, *args, &block)
-        raise NoMethodError.new("no configuration was specified for #{name}")
-      end
-      
-      def define_settings!
-        return if _settings.nil?
-        _settings.each do |key, value|
-          case value
-          when Hash
-            instance_eval <<-"end_eval", __FILE__, __LINE__
-              def #{key}
-                @#{key} ||= self.class.new(_settings["#{key}"])
-              end
-            end_eval
-          else
-            instance_eval <<-"end_eval", __FILE__, __LINE__
-              def #{key}
-                @#{key} ||= _settings["#{key}"]
-              end
-            end_eval
-          end
-        end
-      end
-    end
-  end
-end