spiderfw 0.5.17 → 0.5.18

data/CHANGELOG

@@ -1,10 +1,14 @@
+= 0.5.18
+== 23 December, 2010
+* Ripl for spider console
+* Ruby 1.9.2 support
+* Bugfixes
+
 = 0.5.17
 == 20 December, 2010
 * Better assets compression; assets profiles
 * Bugfixes
 
-
-
 = 0.5.16
 == 07 December, 2010
 * Added app update command

data/VERSION

@@ -1 +1 @@
-0.5.17
+0.5.18

data/apps/soap/lib/soap.rb

@@ -1,4 +1,6 @@
 require 'soap/mapping/registry'
+require 'soap/mapping/factory'
+require 'soap/rpc/router'
 
 module SOAP; module Mapping
     

data/lib/spiderfw/app.rb

@@ -55,7 +55,11 @@ module Spider
                     
                     def http_url(action=nil)
                         if u = Spider.conf.get("#{@dotted_name}.http_url") 
-                            return u
+                            if action
+                                u += '/' if u[-1].chr != '/'
+                                u += action
+                            end
+                            return u 
                         end
                         return nil unless Spider.site
                         u = "http://#{Spider.site.domain}"

data/lib/spiderfw/cmd/commands/console.rb

@@ -5,20 +5,40 @@ class ConsoleCommand < CmdParse::Command
         super( 'console', false )
         @short_desc = _("Open a console")
 #        @description = _("")
-        @opts = {:irb => 'irb'}
+        @opts = {}
         
         self.options = CmdParse::OptionParserWrapper.new do |opt|
-            opt.on("--irb", 
-                   _("Irb executable to use"),
+            opt.on("--irb [IRB]", 
+                   _("Use irb instead of ripl (use given executable if supplied)"),
                    "-i"){ |irb|
-                @opts[:irb] = irb
+                @opts[:irb] = irb ? irb : 'irb'
             }
         end
         
         set_execution_block do
-            ENV['SPIDER_RUNMODE'] = $SPIDER_RUNMODE if ($SPIDER_RUNMODE)
-            ENV['SPIDER_CONFIG_SETS'] = $SPIDER_CONFIG_SETS.join(',') if ($SPIDER_CONFIG_SETS)
-            exec("#{@opts[:irb]} -I #{$SPIDER_LIB} -r spiderfw")
+            unless @opts[:irb]
+                begin
+                    require 'rubygems'
+                    require 'ripl'
+                rescue LoadError
+                    @opts[:irb] = 'irb'
+                end
+            end
+            if @opts[:irb]
+                ENV['SPIDER_RUNMODE'] = $SPIDER_RUNMODE if ($SPIDER_RUNMODE)
+                ENV['SPIDER_CONFIG_SETS'] = $SPIDER_CONFIG_SETS.join(',') if ($SPIDER_CONFIG_SETS)
+                exec("#{@opts[:irb]} -I #{$SPIDER_LIB} -r spiderfw")
+            else
+                require 'ripl/irb'
+                require 'ripl/multi_line' 
+                
+                Ripl.config[:irb_verbose] = false
+                Ripl::Runner.load_rc(Ripl.config[:riplrc])
+                
+                require 'spiderfw'
+                Object.send(:remove_const, :IRB) if Object.const_defined?(:IRB)
+                Ripl.shell.loop
+            end
         end
 
 

data/lib/spiderfw/model/base_model.rb

@@ -97,7 +97,6 @@ module Spider; module Model
             each_element do |el|
                 subclass.add_element(el.clone) unless el.attributes[:local_pk]
             end
-            subclass.instance_variable_set("@mapper_procs_subclass", @mapper_procs_subclass.clone) if @mapper_procs_subclass
             subclass.instance_variable_set("@mapper_modules", @mapper_modules.clone) if @mapper_modules
             subclass.instance_variable_set("@extended_models", @extended_models.clone) if @extended_models
             em = subclass.const_set(:ElementMethods, Module.new)
@@ -968,6 +967,7 @@ module Spider; module Model
         end
         
         def self.mapper_include_for(params, mod)
+            params = [params] unless params.is_a?(Array)
             @mapper_modules_for ||= []
             @mapper_modules_for << [params, mod]
         end
@@ -975,25 +975,21 @@ module Spider; module Model
         # The given proc will be mixed in the mapper used by this class
         # Note that the proc will be converted to a Module, so any overridden methods will still have 
         # access to the super method.
-        def self.with_mapper(*params, &proc)
-            # @mapper_procs ||= []
-            # @mapper_procs << proc
-            mod = Module.new(&proc)
+        def self.with_mapper(&proc)
+            mod = Module.new
+            mod.send(:include, Spider::Model::MapperIncludeModule)
+            mod.module_eval(&proc)
             mapper_include(mod)
         end
-        
-        # FIXME: remove
-        def self.with_mapper_subclasses(*params, &proc) #:nodoc:
-            @mapper_procs_subclass ||= []
-            @mapper_procs_subclass << proc
-        end
-        
+                
         # Like #with_mapper, but will mixin the block only if the mapper matches params.
         # Possible params are:
         # - a String, matching the class' use_storage
         def self.with_mapper_for(*params, &proc)
-            @mapper_procs_for ||= []
-            @mapper_procs_for << [params, proc]
+            mod = Module.new
+            mod.send(:include, Spider::Model::MapperIncludeModule)
+            mod.module_eval(&proc)
+            mapper_include_for(params, mod)
         end
         
         # Sets the url or the name of the storage to use
@@ -1050,24 +1046,11 @@ module Spider; module Model
             end
             if (@mapper_modules_for)
                 @mapper_modules_for.each do |params, mod|
-                    if params.is_a?(String)
-                        mapper.extend(mod) if self.use_storage == params
-                    end
-                end
-            end
-            if (@mapper_procs)
-                @mapper_procs.each{ |proc| mapper.instance_eval(&proc) }
-            end
-            if (@mapper_procs_for)
-                @mapper_procs_for.each do |params, proc|
                     if (params.length == 1 && params[0].class == String)
-                        mapper.instance_eval(&proc) if (self.use_storage == params[0])
+                        mapper.extend(mod) if self.use_storage == params[0]
                     end
                 end
             end
-            if (@mapper_procs_subclass)
-                @mapper_procs_subclass.each{ |proc| mapper.instance_eval(&proc) }
-            end
             return mapper
         end
 

data/lib/spiderfw/model/integrated_element.rb

@@ -20,7 +20,7 @@ module Spider; module Model
         end
         
         def target_element
-            @owner.elements[@integrated_element].type.elements[@integrated_element_element]
+            @target_element ||= @owner.elements[@integrated_element].type.elements[@integrated_element_element]
         end
         
         def type

data/lib/spiderfw/model/mappers/db_mapper.rb

@@ -923,14 +923,16 @@ module Spider; module Model; module Mappers
 
         # Extend schema. Given block will be instance_eval'd after schema auto generation.
         # See also #define_schema.
-        def with_schema(*params, &proc)
-            @schema_proc = proc
+        def with_schema(&proc)
+            @schema_procs ||= []
+            @schema_procs << proc
         end
         
         # Define schema. Given block will be instance_eval'd before schema auto generation.
         # See also #with_schema.
-        def define_schema(*params, &proc)
-            @schema_define_proc = proc
+        def define_schema(&proc)
+            @schema_define_procs ||= []
+            @schema_define_procs << proc
         end
 
         # Returns @schema, or creates one.
@@ -942,13 +944,17 @@ module Spider; module Model; module Mappers
         # Returns the schema, as defined or autogenerated.
         def get_schema
             schema = @model.superclass.mapper.get_schema() if (@model.attributes[:inherit_storage])
-            if (@schema_define_proc)
+            if @schema_define_procs
                 schema =  DbSchema.new
-                schema.instance_eval(&@schema_define_proc)
+                @schema_define_procs.each do |schema_proc|
+                    schema.instance_eval(&schema_proc)
+                end
             end
             schema = generate_schema(schema)
-            if (@schema_proc)
-                schema.instance_eval(&@schema_proc)
+            if @schema_procs
+                @schema_procs.each do |schema_proc|
+                    schema.instance_eval(&schema_proc)
+                end
             end
             return schema
         end
@@ -996,7 +1002,7 @@ module Spider; module Model; module Mappers
                     column.primary_key = true if element.primary_key?
                     schema.set_column(element.name, column)
                 elsif (true) # FIXME: must have condition element.storage == @storage in some of the subcases
-                    if (!element.multiple? && !element.attributes[:junction]) # 1/n <-> 1
+                    if (!element.multiple? && !element.attributes[:junction] && !element.attributes[:condition]) # 1/n <-> 1
                         current_schema = schema.foreign_keys[element.name] || {}
                         foreign_key_constraints = {}
                         element.type.primary_keys.each do |key|

data/lib/spiderfw/model/mappers/mapper.rb

@@ -1074,18 +1074,21 @@ module Spider; module Model
     
     module MapperIncludeModule
         
-        def self.extended(klass)
-            klass.define_schema(&@schema_define_proc) if @schema_define_proc
-            klass.with_schema(&@schema_proc) if @schema_proc
-            super
-        end
-        
         def self.included(mod)
             mod.extend(ModuleMethods)
         end
         
         module ModuleMethods
             
+            def extended(obj)
+                obj.define_schema &@schema_define_proc if @schema_define_proc
+                obj.with_schema &@schema_proc if @schema_proc
+            end
+            
+            def no_map(*els)
+                @no_map_elements ||= {}
+                els.each{ |el| @no_map_elements[el] = true }
+            end
             
         
             def define_schema(&proc)

data/lib/spiderfw/model/model.rb

@@ -347,6 +347,7 @@ end
 
 require 'spiderfw/model/query_funcs'
 require 'spiderfw/model/base_model'
+require 'spiderfw/model/mappers/mapper'
 require 'spiderfw/model/mixins/mixins'
 require 'spiderfw/model/extended_models/managed'
 require 'spiderfw/model/inline_model'

data/spider.gemspec

@@ -39,6 +39,9 @@ Gem::Specification.new do |s|
   s.add_dependency("locale", ["> 2.0"])
   s.add_dependency("builder", ["> 2.1"])
   s.add_dependency("macaddr", [">= 1.0.0"])
+  s.add_dependency("ripl", [">= 0.2.8"])
+  s.add_dependency("ripl-irb", [">= 0.2.1"])
+  s.add_dependency("ripl-multi_line", [">= 0.2.1"])
   s.add_development_dependency("rake", ["> 0.7.3"])
   s.add_development_dependency("ruby-debug", ["> 0.9.3"])
   s.requirements << "Optional dependencies: json, openssl, sqlite3, webrick, mongrel, ruby-oci8 >2.0, mysql, yui-compressor, home_run, cldr"

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: spiderfw
 version: !ruby/object:Gem::Version 
-  hash: 41
+  hash: 47
   prerelease: false
   segments: 
   - 0
   - 5
-  - 17
-  version: 0.5.17
+  - 18
+  version: 0.5.18
 platform: ruby
 authors: 
 - Ivan Pirlik
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-12-20 00:00:00 +01:00
+date: 2010-12-23 00:00:00 +01:00
 default_executable: spider
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -172,9 +172,57 @@ dependencies:
   type: :runtime
   version_requirements: *id010
 - !ruby/object:Gem::Dependency 
-  name: rake
+  name: ripl
   prerelease: false
   requirement: &id011 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 7
+        segments: 
+        - 0
+        - 2
+        - 8
+        version: 0.2.8
+  type: :runtime
+  version_requirements: *id011
+- !ruby/object:Gem::Dependency 
+  name: ripl-irb
+  prerelease: false
+  requirement: &id012 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 21
+        segments: 
+        - 0
+        - 2
+        - 1
+        version: 0.2.1
+  type: :runtime
+  version_requirements: *id012
+- !ruby/object:Gem::Dependency 
+  name: ripl-multi_line
+  prerelease: false
+  requirement: &id013 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 21
+        segments: 
+        - 0
+        - 2
+        - 1
+        version: 0.2.1
+  type: :runtime
+  version_requirements: *id013
+- !ruby/object:Gem::Dependency 
+  name: rake
+  prerelease: false
+  requirement: &id014 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">"
@@ -186,11 +234,11 @@ dependencies:
         - 3
         version: 0.7.3
   type: :development
-  version_requirements: *id011
+  version_requirements: *id014
 - !ruby/object:Gem::Dependency 
   name: ruby-debug
   prerelease: false
-  requirement: &id012 !ruby/object:Gem::Requirement 
+  requirement: &id015 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">"
@@ -202,7 +250,7 @@ dependencies:
         - 3
         version: 0.9.3
   type: :development
-  version_requirements: *id012
+  version_requirements: *id015
 description: Spider is yet another Ruby framework.
 email: abmajor7@gmail.com
 executables: