subapp_model 0.9.2 → 0.9.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7bae56be7585c1055baf65648cdf1506f6d5dddc
-  data.tar.gz: 29fae4545529fac7e4fafcd53bbe3fb1891fa048
+  metadata.gz: 4799ed5473c494b5aa6960b840e96d6f8347306d
+  data.tar.gz: df2b2eb5e1568da58e322d3f64a6b400340431fc
 SHA512:
-  metadata.gz: 1bdd68436712a7b731a8eefbb564c62ffc9320c5ca375d342ee0e159e30d5e4496154242579d88020f36254aff0ecba408ef47e16d835da3d59467ee5f0d54de
-  data.tar.gz: 826a6a4d3ab3cd171cc45c07f2893f2647c7cbb9beb775c73264ca61931fd82193f08b5b55b41a7e9b80db7202e154a8e819a17f72772f5c3b5818f0e99d807e
+  metadata.gz: d14e99687dc0dad8d8668d6a2b35b286de234a653b504744cf76ebcb29dcc542facaf90a3963e0892dafd378383fa04fad041495f565c24b2f598cd579e495c4
+  data.tar.gz: 5df367acaf89e05ec0fc3947f359eb2c8df91958b1cbd28cb0b20e1545be5c5d0dc37730b6cf346508be47b252f9c3efde62b7fb154c38ad80c607a5b0d22ace

data/lib/subapp_model.rb

@@ -8,18 +8,29 @@ rescue LoadError
 end
 # if not using Railtie, call `Kaminari::Hooks.init` directly
 if defined? Rails
-  puts "load rails"
-  Rails.configuration.autoload_paths = [File.expand_path("../#{dir}", __FILE__)]
+  if (!defined? RAILS_APP_MODULE) || RAILS_APP_MODULE.nil?
+       %w{subapp_model}.each do |dir|
+           puts  __FILE__
+           Dir.glob(File.expand_path("../#{dir}", __FILE__) + '/**/*.rb').each do |file|
+              puts file
+              require file
+           end 
+       end
+  else
+    current_file = __FILE__
+    load_str = "module " + RAILS_APP_MODULE + "; class Application < Rails::Application;  config.autoload_paths += [File.expand_path(\"../subapp_model\", \"#{current_file}\")]; end; end"
+    eval(load_str)
+  end
 else
   %w{subapp_model}.each do |dir|
     Dir.glob(File.expand_path("../#{dir}", __FILE__) + '/**/*.rb').each do |file|
         # if(file.index("home_controller") == nil) 
-        $LOAD_PATH.unshift(file)
+        # $LOAD_PATH.unshift(file)
 
         require_file = File.basename(file, ".rb") 
         require_class = require_file.split('_').map {|w| w.capitalize}.join
 
-        #puts "#{require_class} : #{file}"
+        # puts "#{require_class} : #{file}"
      
         autoload "#{require_class}".to_sym,file
     end

data/lib/subapp_model/app.rb

@@ -11,7 +11,7 @@ class App < ActiveRecord::Base
     :app_icon_57_path,
     :app_icon_124_path,
     :background_path,
-    :default_background, 
+    :default_background,
     :loading_icon_path, 
     :loading_default,
     :loading_320x480_path, 
@@ -37,12 +37,17 @@ class App < ActiveRecord::Base
     :app_icon_144_path, #android用
     :channel_num, #渠道号
     :baidu_ios_id, :baidu_ios_key, :baidu_android_id, :baidu_android_key, :ios_ads, :android_ads, :ios_is_upgraded, :android_is_upgraded,
-    :ios_is_recommended, :android_is_recommended
+    :ios_is_recommended, :android_is_recommended, :ad_id, :is_push, :ios_version, :android_version, :production_id, :skin, :font,
+    :is_lite, :ios_is_search, :android_is_search,
+    :qq_ios_key, :qq_android_key,
+    :qq_ios_id, :qq_android_id,
+    :app_icon_120_path, :app_type, :file_url, :certificate_url,
+    :ios_is_chaping, :android_is_chaping
 
   validates :title, :apple_appid, :name, :certificate_name, :presence => true  
-  CONTENT_TYPES = {MUTI_BOZHU: 1, SINGLE_PERSON: 2, SINGLE_ALBUM: 3}
+  CONTENT_TYPES = {MUTI_BOZHU: 1, SINGLE_PERSON: 2, SINGLE_ALBUM: 3, MUTI_CATEGORY: 4, SINGLE_CATEGORY: 5, ALL_CATEGORY: 6}
     # json: 
-    # { 
+    # {
     #   id: app.id,
     #   title: app.title, # app名
     #   name: app.name, # app名
@@ -76,6 +81,10 @@ class App < ActiveRecord::Base
       "单用户多专辑"
     when 3
       "单用户单专辑"
+    when 4
+      "多分类"
+    when 5
+      "单分类"
     end
   end
 
@@ -88,5 +97,4 @@ class App < ActiveRecord::Base
     end  
   end
 
-
 end

data/lib/subapp_model/app_ad.rb

@@ -2,5 +2,5 @@
 class AppAd < ActiveRecord::Base
   establish_connection SUBAPP_DB
   self.table_name = 'tb_app_ad' # 子App广告
-  attr_accessible :name, :description
+  attr_accessible :name, :description, :is_delete
 end

data/lib/subapp_model/app_category.rb

@@ -2,5 +2,5 @@
 class AppCategory < ActiveRecord::Base
   establish_connection SUBAPP_DB
   self.table_name = 'tb_app_category' # 子App分类类型
-  attr_accessible :appid, :category_id, :is_all_tags, :order_num
+  attr_accessible :app_id, :category_id, :category_version, :is_all_tags, :order_num
 end

data/lib/subapp_model/app_material.rb

@@ -1,6 +1,5 @@
-#-*- encoding: utf-8 -*-
 class AppMaterial < ActiveRecord::Base
   establish_connection SUBAPP_DB
   self.table_name = 'tb_app_material' # 子App物料
-  attr_accessible :pic_url, :web_url, :is_delete, :name
+  attr_accessible :pic_url, :web_url, :name
 end

data/lib/subapp_model/version.rb

@@ -1,3 +1,3 @@
 module SubappModel
-  VERSION = "0.9.2"
+  VERSION = "0.9.4"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: subapp_model
 version: !ruby/object:Gem::Version
-  version: 0.9.2
+  version: 0.9.4
 platform: ruby
 authors:
 - gavin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-01 00:00:00.000000000 Z
+date: 2013-11-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler