infopark_rails_connector_meta 1.6.3 → 1.7.0

data/app/models/rails_connector/abstract_obj.rb

@@ -0,0 +1,20 @@
+module RailsConnector
+  # This trick is a workaround to provide compatiblity with both
+  # ObjExtensions-enabled versions (older versions) and ObjExtensions-deprecated
+  # versions (newest versions) of RailsConnector
+  #
+  # It first tries to use user-defined Obj class in the newest RailsConnector,
+  # which is also an alias for RailsConnector::Obj in the older RailsConnector.
+  # If that fails it falls back to ::RailsConnector::BasicObj (new)
+  # or ::RailsConnector::Obj (old).
+  # The last case shouldn't really ever happen.
+  AbstractObj = begin
+                  ::Obj
+                rescue NameError
+                  begin
+                    ::RailsConnector::BasicObj
+                  rescue NameError
+                    ::RailsConnector::Obj
+                  end
+                end
+end

data/{lib/meta → app/models/rails_connector}/obj_class.rb

@@ -25,16 +25,16 @@ module RailsConnector
       @blob_data['titles'] || {}
     end
 
-    # Returns the custom Ruby class or RailsConnector::Obj.
+    # Returns the custom Ruby class or RailsConnector::AbstractObj.
     def ruby_class
       # this must be the same algorithm that the rest of the RailsConnector uses!
-      RailsConnector::Obj.compute_type(self.name)
+      RailsConnector::AbstractObj.compute_type(self.name)
     end
 
     # Returns true, if a custom Ruby class exists.
     def has_custom_ruby_class?
-      self.ruby_class.present? && self.ruby_class != RailsConnector::Obj &&
-          self.ruby_class.ancestors.include?(RailsConnector::Obj)
+      self.ruby_class.present? && self.ruby_class != RailsConnector::AbstractObj &&
+          self.ruby_class.ancestors.include?(RailsConnector::AbstractObj)
     end
 
     # Returns the custom attributes in the form of a Hash.

data/infopark_rails_connector_meta.gemspec

@@ -21,7 +21,7 @@ Gem::Specification.new do |s|
 
   s.add_development_dependency "rspec"
 
-  s.add_runtime_dependency "activerecord", '>= 3.0.10', '<= 3.2.12'
-  s.add_runtime_dependency "activesupport", '>= 3.0.10', '<= 3.2.12'
+  s.add_runtime_dependency "activerecord", '>= 3.0.10', '<= 3.3'
+  s.add_runtime_dependency "activesupport", '>= 3.0.10', '<= 3.3'
   s.add_runtime_dependency "infopark_rails_connector"
 end

data/lib/engine.rb

@@ -0,0 +1,4 @@
+module RailsConnectorMeta
+  class Engine < Rails::Engine
+  end
+end

data/lib/infopark_rails_connector_meta.rb

@@ -0,0 +1,2 @@
+require File.expand_path('../engine', __FILE__) if defined?(Rails)
+require File.expand_path('../meta', __FILE__)

data/lib/meta.rb

@@ -1,10 +1,144 @@
 # -*- encoding : utf-8 -*-
-require 'meta/eager_loader'
-require 'meta/base'
-require 'meta/obj_class'
-require 'meta/attribute'
-require 'meta/object_with_meta_data'
-require 'meta/content'
-require 'meta/version'
-require 'meta/blob_mapping'
-require 'meta/channel'
+module RailsConnector
+
+  module Meta
+
+    # This method is an equivalent of Rails.logger.silence, which has been deprecated
+    def self.hello_im_rails_and_im_retarted_so_please_be_patient(&block)
+      begin
+        old_logger_level, Rails.logger.level = Rails.logger.level, Logger::ERROR
+        yield self
+      ensure
+        Rails.logger.level = old_logger_level
+      end
+    end
+
+    def self.included(base) #:nodoc:
+      #  Class enhancements
+      base.extend(ClassMethods)
+    end
+
+    # The RailsConnector::ObjClass object for this file format.
+    # This will always return a proper object, even if no custom
+    # Ruby class exists.
+    def obj_class_definition
+      @obj_class_definition ||= RailsConnector::Meta::EagerLoader.instance.obj_class(self.obj_class)
+    end
+    alias_method :obj_class_def, :obj_class_definition
+
+    # Returns true, if there is a custom Ruby class defined for the object
+    # or false, if it is represented by RailsConnector::Obj
+    def has_custom_ruby_class?
+      self.class.is_custom_ruby_class?
+    end
+
+    # Returns the custom attributes in the form of a Hash.
+    def custom_attributes
+      self.obj_class_definition.custom_attributes
+    end
+
+    # Returns true, if the file format has an attribute of the given name.
+    def custom_attribute?(attr)
+      self.obj_class_definition.custom_attribute?(attr)
+    end
+
+    # Returns an Array of String of all mandatory attributes, no mather if it's
+    # custom or built-in. Built-in attributes are underscored (valid_from,
+    # not validFrom).
+    # Possible +options+ are:
+    # <tt>:only_custom_attributes</tt>:: Return only custom attributes, omit
+    # built-in attributes like content_type or valid_from.
+    def mandatory_attribute_names(options = {})
+      self.obj_class_definition.mandatory_attribute_names(options)
+    end
+
+    # Returns true, if the file format has an mandatory attribute of the given name.
+    def mandatory_attribute?(attr)
+      self.obj_class_definition.mandatory_attribute?(attr)
+    end
+
+    # Returns the version of this object. This number is increased every time
+    # this object is released.
+    def version
+      load_meta_details
+      @object_with_meta_data.version.presence.to_i || 0
+    end
+
+    # Returns the time of the reminder, if it is set.
+    def reminder_from
+      load_meta_details
+      @object_with_meta_data.reminder_from.presence &&
+          ::RailsConnector::DateAttribute.parse(@object_with_meta_data.reminder_from)
+    end
+
+    # Returns the reminder comment, if a reminder is set.
+    def reminder_comment
+      load_meta_details
+      @object_with_meta_data.reminder_comment
+    end
+
+    # Return the name of the workflow, that is assigned to this object.
+    def workflow_name
+      load_meta_details
+      @object_with_meta_data.workflow_name
+    end
+
+    # Return the current editor as a String. If there is no edited content,
+    # which is always the case in live mode, an empty String is returned.
+    # The 'contents' table is queried for this information.
+    def editor
+      return @editor if @editor
+
+      load_meta_details
+
+      content_id = if self.edited?
+        @object_with_meta_data.edited_content_id
+      else
+        @object_with_meta_data.released_cont_id
+      end
+
+      if content_id
+        content = RailsConnector::Content.find(content_id)
+        @editor = content.editor
+      else
+        @editor = ''
+      end
+    end
+
+    private
+
+    # Load the objects details from the `objects' tables.
+    def load_meta_details #:nodoc:
+      return if @object_with_meta_data
+
+      @object_with_meta_data = RailsConnector::ObjectWithMetaData.find(self.id)
+
+      # reset depending instance variables
+      @editor = nil
+    end
+
+
+    # the methods in this module will become class methods
+    module ClassMethods
+
+      # The RailsConnector::ObjClass object for this file format.
+      # This will only return a proper object if a custom Ruby class exists
+      # and will throw a RuntimeError otherwise.
+      def obj_class_definition
+        raise "Obtaining the obj_class_definition of an Obj without custom Ruby class " \
+                  "is logically impossible." unless is_custom_ruby_class?
+        # @obj_class_definition ||= RailsConnector::ObjClass.find_by_name(self.name)
+        @obj_class_definition ||= RailsConnector::Meta::EagerLoader.instance.obj_class(self.name)
+      end
+      alias_method :obj_class_def, :obj_class_definition
+
+      # RailsConnector::AbstractObj returns false, everything else true.
+      def is_custom_ruby_class?
+        self != RailsConnector::AbstractObj
+      end
+
+    end
+
+  end
+
+end

data/lib/meta/version.rb

@@ -1,6 +1,6 @@
 # -*- encoding : utf-8 -*-
 module RailsConnector
   module Meta
-    VERSION = "1.6.3"
+    VERSION = "1.7.0"
   end
 end

data/spec/infopark_rails_connector_meta_spec.rb

@@ -12,7 +12,7 @@ describe Obj do
     nil.should be_false   # we're off a good start
 
     # everything should be false here
-    obj = RailsConnector::Obj.where(:obj_class => 'ObjClassWithoutRubyClass').first
+    obj = RailsConnector::AbstractObj.where(:obj_class => 'ObjClassWithoutRubyClass').first
     obj.obj_class_def.has_custom_ruby_class?.should be_false
     obj.has_custom_ruby_class?.should be_false
     obj.class.is_custom_ruby_class?.should be_false
@@ -25,7 +25,7 @@ describe Obj do
   end
 
   it "should respond to obj_class_def/obj_class_definition correctly" do
-    obj = RailsConnector::Obj.where(:obj_class => 'ObjClassWithoutRubyClass').first
+    obj = RailsConnector::AbstractObj.where(:obj_class => 'ObjClassWithoutRubyClass').first
     obj.obj_class_def.name.should == 'ObjClassWithoutRubyClass'
     obj.obj_class_definition.name.should == 'ObjClassWithoutRubyClass'
 
@@ -47,8 +47,7 @@ describe RailsConnector::ObjClass do
 
   it "should serve the proper Ruby class" do
     obj_class_def = RailsConnector::ObjClass.where(:obj_class_name => 'ObjClassWithoutRubyClass').first
-    obj_class_def.ruby_class.should == RailsConnector::Obj
-    obj_class_def.ruby_class.should == ::Obj
+    obj_class_def.ruby_class.should == RailsConnector::AbstractObj.obj_class_def.ruby_class.should == ::Obj
     obj_class_def.has_custom_ruby_class?.should be_false
 
     obj2_class_def = RailsConnector::ObjClass.where(:obj_class_name => 'StandardPage').first

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: infopark_rails_connector_meta
 version: !ruby/object:Gem::Version 
-  hash: 9
+  hash: 11
   prerelease: 
   segments: 
   - 1
-  - 6
-  - 3
-  version: 1.6.3
+  - 7
+  - 0
+  version: 1.7.0
 platform: ruby
 authors: 
 - Tomasz Przedmojski
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2013-02-13 00:00:00 +01:00
+date: 2013-02-21 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -48,12 +48,11 @@ dependencies:
         version: 3.0.10
     - - <=
       - !ruby/object:Gem::Version 
-        hash: 23
+        hash: 1
         segments: 
         - 3
-        - 2
-        - 12
-        version: 3.2.12
+        - 3
+        version: "3.3"
   type: :runtime
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
@@ -72,12 +71,11 @@ dependencies:
         version: 3.0.10
     - - <=
       - !ruby/object:Gem::Version 
-        hash: 23
+        hash: 1
         segments: 
         - 3
-        - 2
-        - 12
-        version: 3.2.12
+        - 3
+        version: "3.3"
   type: :runtime
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
@@ -108,16 +106,18 @@ files:
 - Gemfile
 - LICENSE
 - Rakefile
+- app/models/rails_connector/abstract_obj.rb
+- app/models/rails_connector/attribute.rb
+- app/models/rails_connector/blob_mapping.rb
+- app/models/rails_connector/channel.rb
+- app/models/rails_connector/content.rb
+- app/models/rails_connector/meta/eager_loader.rb
+- app/models/rails_connector/obj_class.rb
+- app/models/rails_connector/object_with_meta_data.rb
 - infopark_rails_connector_meta.gemspec
+- lib/engine.rb
+- lib/infopark_rails_connector_meta.rb
 - lib/meta.rb
-- lib/meta/attribute.rb
-- lib/meta/base.rb
-- lib/meta/blob_mapping.rb
-- lib/meta/channel.rb
-- lib/meta/content.rb
-- lib/meta/eager_loader.rb
-- lib/meta/obj_class.rb
-- lib/meta/object_with_meta_data.rb
 - lib/meta/version.rb
 - spec/infopark_rails_connector_meta_spec.rb
 - spec/spec_helper.rb

data/lib/meta/base.rb

@@ -1,146 +0,0 @@
-# -*- encoding : utf-8 -*-
-require 'meta/eager_loader'
-
-module RailsConnector
-
-  module Meta
-
-    # This method is an equivalent of Rails.logger.silence, which has been deprecated
-    def self.hello_im_rails_and_im_retarted_so_please_be_patient(&block)
-      begin
-        old_logger_level, Rails.logger.level = Rails.logger.level, Logger::ERROR
-        yield self
-      ensure
-        Rails.logger.level = old_logger_level
-      end
-    end
-
-    def self.included(base) #:nodoc:
-      #  Class enhancements
-      base.extend(ClassMethods)
-    end
-
-    # The RailsConnector::ObjClass object for this file format.
-    # This will always return a proper object, even if no custom
-    # Ruby class exists.
-    def obj_class_definition
-      @obj_class_definition ||= RailsConnector::Meta::EagerLoader.instance.obj_class(self.obj_class)
-    end
-    alias_method :obj_class_def, :obj_class_definition
-
-    # Returns true, if there is a custom Ruby class defined for the object
-    # or false, if it is represented by RailsConnector::Obj
-    def has_custom_ruby_class?
-      self.class.is_custom_ruby_class?
-    end
-
-    # Returns the custom attributes in the form of a Hash.
-    def custom_attributes
-      self.obj_class_definition.custom_attributes
-    end
-
-    # Returns true, if the file format has an attribute of the given name.
-    def custom_attribute?(attr)
-      self.obj_class_definition.custom_attribute?(attr)
-    end
-
-    # Returns an Array of String of all mandatory attributes, no mather if it's
-    # custom or built-in. Built-in attributes are underscored (valid_from,
-    # not validFrom).
-    # Possible +options+ are:
-    # <tt>:only_custom_attributes</tt>:: Return only custom attributes, omit
-    # built-in attributes like content_type or valid_from.
-    def mandatory_attribute_names(options = {})
-      self.obj_class_definition.mandatory_attribute_names(options)
-    end
-
-    # Returns true, if the file format has an mandatory attribute of the given name.
-    def mandatory_attribute?(attr)
-      self.obj_class_definition.mandatory_attribute?(attr)
-    end
-
-    # Returns the version of this object. This number is increased every time
-    # this object is released.
-    def version
-      load_meta_details
-      @object_with_meta_data.version.presence.to_i || 0
-    end
-
-    # Returns the time of the reminder, if it is set.
-    def reminder_from
-      load_meta_details
-      @object_with_meta_data.reminder_from.presence &&
-          ::RailsConnector::DateAttribute.parse(@object_with_meta_data.reminder_from)
-    end
-
-    # Returns the reminder comment, if a reminder is set.
-    def reminder_comment
-      load_meta_details
-      @object_with_meta_data.reminder_comment
-    end
-
-    # Return the name of the workflow, that is assigned to this object.
-    def workflow_name
-      load_meta_details
-      @object_with_meta_data.workflow_name
-    end
-
-    # Return the current editor as a String. If there is no edited content,
-    # which is always the case in live mode, an empty String is returned.
-    # The 'contents' table is queried for this information.
-    def editor
-      return @editor if @editor
-
-      load_meta_details
-
-      content_id = if self.edited?
-        @object_with_meta_data.edited_content_id
-      else
-        @object_with_meta_data.released_cont_id
-      end
-
-      if content_id
-        content = RailsConnector::Content.find(content_id)
-        @editor = content.editor
-      else
-        @editor = ''
-      end
-    end
-
-    private
-
-    # Load the objects details from the `objects' tables.
-    def load_meta_details #:nodoc:
-      return if @object_with_meta_data
-
-      @object_with_meta_data = RailsConnector::ObjectWithMetaData.find(self.id)
-
-      # reset depending instance variables
-      @editor = nil
-    end
-
-
-    # the methods in this module will become class methods
-    module ClassMethods
-
-      # The RailsConnector::ObjClass object for this file format.
-      # This will only return a proper object if a custom Ruby class exists
-      # and will throw a RuntimeError otherwise.
-      def obj_class_definition
-        raise "Obtaining the obj_class_definition of an Obj without custom Ruby class " \
-                  "is logically impossible." unless is_custom_ruby_class?
-        # @obj_class_definition ||= RailsConnector::ObjClass.find_by_name(self.name)
-        @obj_class_definition ||= RailsConnector::Meta::EagerLoader.instance.obj_class(self.name)
-      end
-      alias_method :obj_class_def, :obj_class_definition
-
-      # RailsConnector::Obj returns false, everything else true.
-      def is_custom_ruby_class?
-        self != RailsConnector::Obj
-      end
-
-    end
-
-  end
-
-end