ns_service_pack 0.0.4 → 0.0.5

data/History

@@ -21,3 +21,11 @@
 * 将对ApplicationController和ActiveRecord::Base的扩展放在
   initializers/ns_service_pack.rb中，便于项目做定制
 
+#==0.0.4 
+* 同一版本号不能向rubygems上提交两次？那怎么更新那个版本呢？
+* 本地可以启用gem server，客户端通过以下指定源方式安装
+  gem install --source http://cao:8808
+
+#==0.0.5
+* 初步解决application controller问题
+* 添加默认index精确搜索条件

data/README

@@ -9,8 +9,8 @@
 *3 配置项目中的常量数据
    config/code_hashes/**/*.yml中数据会作为CodeHash加载
    可在控制台下用以下命令辅助生成：
-     <ModelName>.dump_field_map
-     生成buz-db field_mapping,可配置, --><app>/config/code_hashes
+     <ModelName>.dump_mapping
+     生成buz-db field_mapping, 可配置, --><app>/config/code_hashes
 
      <ModelName>.dump_init_hash
      为远端客户端生成初始项hash结构，--> <app>/data/*.yml

data/config/initializers/ns_service_pack.rb

@@ -6,7 +6,10 @@ GlobalConst.load_app_code_hashes!
 #对rails应用的扩展
 if defined?(Rails)
   #TODO 为什么不能像ActiveRecord::Base一样include，到底什么道理呢？？？
-  class ApplicationController < ActionController::Base
+  #预加载，否则此处定义后为什么不去加载项目中的定义文件呢？？？
+  #这样做的缺点，改变了加载顺序，需调查有依赖时是否影响较大？？？
+  require 'application_controller'
+  class ApplicationController # < ActionController::Base
     include ApplicationControllerModule
   end
   if defined?(ActiveRecord::Base)

data/lib/ns_service_pack/application_controller_module.rb

@@ -2,30 +2,45 @@
 module ApplicationControllerModule
   def index
     @conds ||= {}
-    #TODO 添加默认搜索行为
-    result = paginate(model_class, @conds, params)
+    where_conds = if (params.key?(:not_default) || @conds.present?)
+      @conds
+    else
+      query_conditionize(params, @conds)
+    end
+    logger.debug "====>conds: #{where_conds.inspect}"
+    
+    result = paginate(model_class, where_conds, params)
     render :json=>ResultPacker.data(result.as_json)
   end
 
+  def query_conditionize(params = {}, conds = {})
+    #TODO 有@conds时如何融入？？？
+    #hash结构
+    conds = model_class.db_hashize(params)
+  end
+
   #分页方法
-  def paginate(base_class=nil, conds={}, params={})
-    #TODO 
-    raise "参数无效！" unless base_class.superclass == ActiveRecord::Base
+  def paginate(base_class = nil, where_conds = {}, params = {})
+    #raise "参数无效！" unless base_class.superclass == ActiveRecord::Base #TODO
+    
+    #计算page参数
     page_num = params[:current_page].to_i
     page_num = page_num < 1 ? 1 : page_num
     page_size = params[:page_size].to_i
     page_size = page_size <= 0 ? 10 : page_size
     page_size = page_size > 250 ? 250 : page_size
     offset = (page_num-1)*page_size
-    
+   
+    #db 查询
+    conds = {:conditions=>where_conds}
     total_count = base_class.count(conds)
     conds.merge!(:limit=>page_size,
                  :offset=>offset,
                  :order=>params[:order])
-
     new_conds = conds #yield conds
     #添加select子句 TODO
     page_data = base_class.all(new_conds)
+    
     {
      :total_size=>total_count,
      :page_size=>page_size,
@@ -35,6 +50,7 @@ module ApplicationControllerModule
      :page_items=>page_data
     }
   end
+  
   #查找单条记录
   def show
     result = model_class.find(params[:id])
@@ -66,10 +82,9 @@ module ApplicationControllerModule
     (error_hash||{}).each{|k, v| error_hash[k] = v.join(', ') if v.is_a? Array }
   end
 
-  #ABORTED NOW
+  #ABORTED NOW, keep here
   def query_fields
     data = model_class.field_maps.keys.inject({}){|result, k| result[k]=nil; result}
-    #model_class.new.attributes #初始值问题 TODO 
     render :json=>ResultPacker.data(:fields=>data)
   end
 

data/lib/ns_service_pack/field_mapping.rb

@@ -5,7 +5,6 @@
 require 'fileutils'
 module FieldMapping
   def self.included(base)
-    #TODO 条件检查
     base.extend(ClassMethods)
   end
 
@@ -25,11 +24,27 @@ module FieldMapping
       "#{model_name}_fields"
     end
 
+    def mapping
+      GlobalConst.send(model_key)
+    end
+
+    def get_map_value(k, value)
+      #raise "Not implemented!"
+      #提供默认处理
+      #TODO 根据数据类型做些更好的转换
+      case k
+      when :created_at, :updated_at
+        value.try(:to_s, :db)
+      else
+        value
+      end
+    end
+    
     def dump_init_hash(force=true)
       if defined?(Rails)
         file = "#{Rails.root}/data/#{model_key}.yml"
         path = File.dirname(file)
-        FileUtils.mkpath(path) unless File.exists?(path)
+        FileUtils.mkpath(path) unless File.directory?(path)
         existed = File.exists?(file)
         if existed
           puts "Warning: #{file} has existed! check it! Default override it!"
@@ -42,21 +57,32 @@ module FieldMapping
       end
     end
     
-    #TODO 
-    def dump_field_map(force=true)
+    #辅助方法
+    def new_from_buz(params = {})
+      new(db_hashize(params))
+    end
+    def create_from_buz(params = {})
+      create(db_hashize(params))
+    end
+    
+    #生成field mapping，dump到指定的yaml文件中
+    def dump_mapping(attr_prefix = nil, force = true)
       if defined?(Rails)
         file = "#{Rails.root}/#{GlobalConst::APP_CODE_HASHES}#{model_key}.yml"
         path = File.dirname(file)
-        FileUtils.mkpath(path) unless File.exists?(path)
+        FileUtils.mkpath(path) unless File.directory?(path)
         existed = File.exists?(file)
         if existed
           puts "Warning: #{file} has existed! check it! Default override it!"
         end
         if !existed || force
+          #获取数据库字段列表，屏蔽掉自动维护的created_at/updated_at，也可在生成的文件中配上
           keys = new.attributes.symbolize_keys.keys.delete_if{|k| k =~ /^created_at|updated_at$/}
           h = keys.inject({}) do |r, k|
-            new_key = k.to_s.sub("#{model_name}_", '').to_sym
-            r[new_key]=k 
+            #移除掉表前缀
+            rm_prefix = attr_prefix.nil? ? "#{model_name}_" : attr_prefix
+            new_key = k.to_s.sub(rm_prefix, '').to_sym
+            r[new_key] = k 
             r
           end
           FileUtils.rm_f(file) if existed
@@ -67,67 +93,35 @@ module FieldMapping
         end
       end
     end
-    
-    def code_hashes
-      raise "Not implemented!"
-    end
 
-    def new_from_buz(params={})
-      new(db_hashize(params))
-    end
-    
-    def create_from_buz(params={})
-      create(db_hashize(params))
-    end
-    
-    #TODO 在包装类提供此方法，可在include前检查
-    # #TODO 优化
-    def field_maps
-      #raise "Not implemented!"
-      #提供默认实现  
-      GlobalConst.send(model_key).data
-    end
-
-    def inspect_fields
-      puts "#buz fields\t\t#db fields\t\t #the rules"
-      field_maps.each do |k, v|
-        puts "#{k}\t\t #{v}           "
-      end
-    end
-
-    def get_map_value(k, value)
-      #raise "Not implemented!"
-      #提供默认处理
-      case k
-      when :created_at, :updated_at
-        value.try(:to_s, :db)
-      else
-        value
-      end
+    def dump_field_maps(force=true)
+      #TODO
+      puts "==Warning: please use dump_mapping instead, this will be removed..."
+      dump_mapping(nil, true)
     end
    
-    #业务层到数据层字段的转换
-    def db_hashize(params={})
+    #业务层到数据层字段参数转换并做一定值处理
+    def db_hashize(params = {})
       new_params = params.symbolize_keys
-      common_keys = new_params.keys & field_maps.keys
-      common_keys.inject({}) do |r, e|
-        r[field_maps[e]] = get_map_value(e, new_params[e])
-        r
+      common_keys = new_params.keys & mapping.keys
+      common_keys.inject({}) do |result, key|
+        result[mapping[key]] = get_map_value(key, new_params[key])
+        result
       end
     end
  
-    #转成业务层key表示
-    def buz_hashize(attrs={})
+    #将数据层表示转成业务层表示
+    def buz_hashize(attrs = {})
       #return {} if attrs.blank?
       #获取默认初始值
       attrs = new.attributes if attrs.blank?
       new_attrs = attrs.symbolize_keys
-      invert_maps = field_maps.invert
+      invert_maps = mapping.invert_data
       common_db_attrs = new_attrs.keys & invert_maps.keys
-      common_db_attrs.inject({}) do |r, da| 
-        ba = invert_maps[da]
-        r[ba]=get_map_value(ba, new_attrs[da])
-        r
+      common_db_attrs.inject({}) do |result, attr| 
+        buz_field = invert_maps[attr]
+        result[buz_field] = get_map_value(buz_field, new_attrs[attr])
+        result
       end
     end
   end

data/lib/ns_service_pack/global_const.rb

@@ -47,7 +47,7 @@ module GlobalConst
   end
   
   #为引用项目生成样例文件， TODO rake方式生成
-  def self.setup_code_hashes(yml_file = "#{APP_CODE_HASHES}/code_hashes.yml.sample")
+  def self.setup_sample(yml_file = "#{APP_CODE_HASHES}code_hashes.yml.sample")
     if defined? Rails
       target = "#{Rails.root}/#{yml_file}"
       unless File.exists?(target)
@@ -58,5 +58,22 @@ module GlobalConst
       end
     end
   end
-end
 
+  #将一个hash和array写入data下的yaml结构中
+  def self.yamlize(hash_or_array = {})
+    return if hash.nil?
+    if hash_or_array.is_a? Array
+      hash = hash_or_array.inject({}) do |r, k|
+        r[k] = nil
+        r
+      end
+    end
+    name = "hash#{Time.now.to_i}"
+    file = "#{Rails.root}/data/#{name}.yml"
+    path = File.dirname(file)
+    Fileutils.mkpath(path) unless File.directory?(path)
+    File.open(file, 'w+') do |f|
+      f.puts YAML.dump(name.to_sym=>hash)
+    end
+  end
+end

data/lib/ns_service_pack/version.rb

@@ -1,3 +1,3 @@
 module NsServicePack 
-  VERSION = '0.0.4'
+  VERSION = '0.0.5'
 end

data/lib/ns_service_pack.rb

@@ -11,18 +11,17 @@ require 'ns_service_pack/result_packer'
 require 'ns_service_pack/application_controller_module'
 
 module NsServicePack
+  #初始安装设置
   def self.install 
-    #添加一个初始化文件
     init_file = "#{Rails.root}/config/initializers/ns_service_pack.rb"
     unless File.exists?(init_file)
       FileUtils.cp("#{NS_GEM_ROOT}/config/initializers/ns_service_pack.rb", init_file)
       puts "==>I have installed a intializer file: #{init_file}"
-      GlobalConst.setup_code_hashes
-      puts "==>Now you can config your constants in folder: #{GlobalConst::APP_CODE_HASHES}"
+      GlobalConst.setup_sample
+      puts "==>Now config your constants in folder: #{GlobalConst::APP_CODE_HASHES}"
     else
       puts "==>It seems you have installed ns service pack, happy with it or bug report to caory!"
     end
   end
 end
 
-puts "==>NsServicePack has installed into application, ^^caory"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ns_service_pack
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
   prerelease: 
 platform: ruby
 authors:
@@ -11,11 +11,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-11-16 00:00:00.000000000Z
+date: 2011-11-17 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &85806930 !ruby/object:Gem::Requirement
+  requirement: &69719820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -23,7 +23,7 @@ dependencies:
         version: 3.1.0
   type: :development
   prerelease: false
-  version_requirements: *85806930
+  version_requirements: *69719820
 description: Service package for our service lier
 email: cao7113@gmail.com
 executables: []