caishu_model 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 24f1625fd7cffdf480445360f9f1f2e93d8c65ce
-  data.tar.gz: a9694ec5f92495f2420c0423a73d58d4ad6407db
+  metadata.gz: c8798f5ec85bb351b7be6601ee8fd16c311cf167
+  data.tar.gz: 88604a28fe5caf20b3265379c9b409e0f3d08ca2
 SHA512:
-  metadata.gz: 8f1bcda2b5e6f19e5534c818131ee8c49675de064706152d99a42f0772d72536dad0c505986f575aba4cb164e44de56734a7e5d3eede9e247378d26d5281f52f
-  data.tar.gz: e380dfe44a41eba698448f2762b946de8b153e41fb7d4e45910f53365c5972e837a0bb4a05d6ae3d67454dee51b7686e0150100e740517faa4b0080eb024e9e9
+  metadata.gz: cf0e4e241b425446b1f8a7aeb89dd0f30768c386f230c61db69b2f905681e68d3c83afc09528967a0baa9ec3930da704dc84a49b351b9f78882a3d97f2b9411b
+  data.tar.gz: 3bd09239a70ffa61010a82eccabc8b20c8682435964b2a0e8c020d30635257d2d4c39252b2b810bb7d4ed267d77d6ba96a3c1f5f0a739ffab827b68d80d386a5

data/Gemfile

@@ -1,4 +1,8 @@
-source 'https://rubygems.org'
+source 'http://ruby.taobao.org'
 
 # Specify your gem's dependencies in caishu_model.gemspec
-gemspec
+
+gem 'rake'
+gem 'sinatra'
+gem 'sinatra-activerecord'
+gem 'mysql2'

data/README.md

@@ -16,4 +16,6 @@ Or install it yourself as:
     $ gem install caishu_model
 
 ## Usage
-直接使用
+直接使用
+
+rake -T

data/Rakefile

@@ -1 +1,5 @@
-require "bundler/gem_tasks"
+require 'sinatra'
+require "sinatra/activerecord"
+require "sinatra/activerecord/rake"
+
+set :database_file, File.expand_path("../config/database.yml",__FILE__)

data/caishu_model.gemspec

@@ -5,7 +5,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |spec|
   spec.name          = "caishu_model"
-  spec.version       = '0.1.1'
+  spec.version       = '0.1.2'
   spec.authors       = ["menghuanwd"]
   spec.email         = ["651019063@qq.com"]
   spec.summary       = %q{caishu项目的models}
@@ -19,6 +19,9 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_development_dependency "bundler", "~> 1.5"
-  spec.add_development_dependency "rake"
-  spec.add_dependency "activerecord"
-end
+  # spec.add_development_dependency "rake"
+  # spec.add_development_dependency "mysql2"
+  # spec.add_development_dependency "sinatra"
+  # spec.add_development_dependency "sinatra-activerecord"
+  
+end

data/config/database.yml

@@ -0,0 +1,9 @@
+development:
+  adapter: mysql2
+  encoding: utf8
+  reconnect: false
+  host: localhost
+  database: elasticsearch3
+  pool: 5
+  username: diningcity
+  password: dave

data/db/migrate/20131228035304_create_categories.rb

@@ -0,0 +1,10 @@
+class CreateCategories < ActiveRecord::Migration
+  def change
+    create_table :categories do |t|
+      t.string :title
+      t.string :name
+
+      t.timestamps
+    end
+  end
+end

data/db/migrate/20131228035434_create_users.rb

@@ -0,0 +1,11 @@
+class CreateUsers < ActiveRecord::Migration
+  def change
+    create_table :users do |t|
+      t.string :username
+      t.string :password
+      t.string :hashed_password
+
+      t.timestamps
+    end
+  end
+end

data/db/migrate/20131228040423_create_jokes.rb

@@ -0,0 +1,10 @@
+class CreateJokes < ActiveRecord::Migration
+  def change
+    create_table :jokes do |t|
+      t.string :title
+      t.text :content
+
+      t.timestamps
+    end
+  end
+end

data/db/migrate/20131228040436_create_photos.rb

@@ -0,0 +1,11 @@
+class CreatePhotos < ActiveRecord::Migration
+  def change
+    create_table :photos do |t|
+      t.integer :photo_category_id
+      t.integer :picture_id
+      t.string :title
+
+      t.timestamps
+    end
+  end
+end

data/db/migrate/20131228040446_create_photo_categories.rb

@@ -0,0 +1,9 @@
+class CreatePhotoCategories < ActiveRecord::Migration
+  def change
+    create_table :photo_categories do |t|
+      t.string :title
+
+      t.timestamps
+    end
+  end
+end

data/db/migrate/20131228040454_create_moods.rb

@@ -0,0 +1,9 @@
+class CreateMoods < ActiveRecord::Migration
+  def change
+    create_table :moods do |t|
+      t.text :content
+      t.string :picture_id
+      t.timestamps
+    end
+  end
+end

data/db/migrate/20131228040501_create_notes.rb

@@ -0,0 +1,11 @@
+class CreateNotes < ActiveRecord::Migration
+  def change
+    create_table :notes do |t|
+      t.string :title
+      t.text :content
+      t.string :photos
+      t.integer :note_category_id
+      t.timestamps
+    end
+  end
+end

data/db/migrate/20131228040507_create_note_categories.rb

@@ -0,0 +1,9 @@
+class CreateNoteCategories < ActiveRecord::Migration
+  def change
+    create_table :note_categories do |t|
+      t.string :title
+
+      t.timestamps
+    end
+  end
+end

data/db/migrate/20131228040512_create_touches.rb

@@ -0,0 +1,11 @@
+class CreateTouches < ActiveRecord::Migration
+  def change
+    create_table :touches do |t|
+      t.string :title
+      t.integer :picture_id
+      t.string :description
+
+      t.timestamps
+    end
+  end
+end

data/db/migrate/20131228040518_create_philosophies.rb

@@ -0,0 +1,10 @@
+class CreatePhilosophies < ActiveRecord::Migration
+  def change
+    create_table :philosophies do |t|
+      t.string :title
+      t.string :content
+
+      t.timestamps
+    end
+  end
+end

data/db/migrate/20131228062726_create_goodfriends.rb

@@ -0,0 +1,14 @@
+class CreateGoodfriends < ActiveRecord::Migration
+  def change
+    create_table :goodfriends do |t|
+      t.string :qq
+      t.string :weixin
+      t.integer :age
+      t.integer :gender
+      t.string :name
+      t.string :telephone
+      t.integer :picture_id
+      t.timestamps
+    end
+  end
+end

data/db/migrate/20131229060517_create_pictures.rb

@@ -0,0 +1,12 @@
+class CreatePictures < ActiveRecord::Migration
+  def change
+    create_table :pictures do |t|
+      t.string :file_key
+      t.string :file_name
+      t.integer :file_size
+      t.string :file_type
+      t.string :file_url
+      t.timestamps
+    end
+  end
+end

data/db/migrate/20140105151951_create_photo_details.rb

@@ -0,0 +1,11 @@
+class CreatePhotoDetails < ActiveRecord::Migration
+  def change
+    create_table :photo_details do |t|
+      t.integer :click_times,:default => 0
+      t.integer :download_times,:default => 0
+      t.integer :photo_id
+
+      t.timestamps
+    end
+  end
+end

data/db/migrate/20140215021413_create_englishes.rb

@@ -0,0 +1,9 @@
+class CreateEnglishes < ActiveRecord::Migration
+  def change
+    create_table :englishes do |t|
+      t.text :content
+
+      t.timestamps
+    end
+  end
+end

data/db/migrate/20140315034952_create_weixin_messages.rb

@@ -0,0 +1,11 @@
+class CreateWeixinMessages < ActiveRecord::Migration
+  def change
+    create_table :weixin_messages do |t|
+      t.string :content
+      t.string :report
+      t.boolean :status
+
+      t.timestamps
+    end
+  end
+end

data/db/migrate/20140406030204_add_is_display_to_photo.rb

@@ -0,0 +1,6 @@
+class AddIsDisplayToPhoto < ActiveRecord::Migration
+  def change
+    add_column :photos, :is_display, :boolean, default: true
+
+  end
+end

data/db/schema.rb

@@ -0,0 +1,134 @@
+# encoding: UTF-8
+# This file is auto-generated from the current state of the database. Instead
+# of editing this file, please use the migrations feature of Active Record to
+# incrementally modify your database, and then regenerate this schema definition.
+#
+# Note that this schema.rb definition is the authoritative source for your
+# database schema. If you need to create the application database on another
+# system, you should be using db:schema:load, not running all the migrations
+# from scratch. The latter is a flawed and unsustainable approach (the more migrations
+# you'll amass, the slower it'll run and the greater likelihood for issues).
+#
+# It's strongly recommended that you check this file into your version control system.
+
+ActiveRecord::Schema.define(version: 20140406030204) do
+
+  create_table "categories", force: true do |t|
+    t.string   "title"
+    t.string   "name"
+    t.datetime "created_at"
+    t.datetime "updated_at"
+  end
+
+  create_table "englishes", force: true do |t|
+    t.text     "content"
+    t.datetime "created_at"
+    t.datetime "updated_at"
+  end
+
+  create_table "goodfriends", force: true do |t|
+    t.string   "qq"
+    t.string   "weixin"
+    t.integer  "age"
+    t.integer  "gender"
+    t.string   "name"
+    t.string   "telephone"
+    t.integer  "picture_id"
+    t.datetime "created_at"
+    t.datetime "updated_at"
+  end
+
+  create_table "jokes", force: true do |t|
+    t.string   "title"
+    t.text     "content"
+    t.datetime "created_at"
+    t.datetime "updated_at"
+  end
+
+  create_table "moods", force: true do |t|
+    t.text     "content"
+    t.string   "picture_id"
+    t.datetime "created_at"
+    t.datetime "updated_at"
+  end
+
+  create_table "note_categories", force: true do |t|
+    t.string   "title"
+    t.datetime "created_at"
+    t.datetime "updated_at"
+  end
+
+  create_table "notes", force: true do |t|
+    t.string   "title"
+    t.text     "content"
+    t.string   "photos"
+    t.integer  "note_category_id"
+    t.datetime "created_at"
+    t.datetime "updated_at"
+  end
+
+  create_table "philosophies", force: true do |t|
+    t.string   "title"
+    t.string   "content"
+    t.datetime "created_at"
+    t.datetime "updated_at"
+  end
+
+  create_table "photo_categories", force: true do |t|
+    t.string   "title"
+    t.datetime "created_at"
+    t.datetime "updated_at"
+  end
+
+  create_table "photo_details", force: true do |t|
+    t.integer  "click_times",    default: 0
+    t.integer  "download_times", default: 0
+    t.integer  "photo_id"
+    t.datetime "created_at"
+    t.datetime "updated_at"
+  end
+
+  create_table "photos", force: true do |t|
+    t.integer  "photo_category_id"
+    t.integer  "picture_id"
+    t.string   "title"
+    t.datetime "created_at"
+    t.datetime "updated_at"
+    t.boolean  "is_display",        default: true
+  end
+
+  create_table "pictures", force: true do |t|
+    t.string   "file_key"
+    t.string   "file_name"
+    t.integer  "file_size"
+    t.string   "file_type"
+    t.string   "file_url"
+    t.datetime "created_at"
+    t.datetime "updated_at"
+  end
+
+  create_table "touches", force: true do |t|
+    t.string   "title"
+    t.integer  "picture_id"
+    t.string   "description"
+    t.datetime "created_at"
+    t.datetime "updated_at"
+  end
+
+  create_table "users", force: true do |t|
+    t.string   "username"
+    t.string   "password"
+    t.string   "hashed_password"
+    t.datetime "created_at"
+    t.datetime "updated_at"
+  end
+
+  create_table "weixin_messages", force: true do |t|
+    t.string   "content"
+    t.string   "report"
+    t.boolean  "status"
+    t.datetime "created_at"
+    t.datetime "updated_at"
+  end
+
+end

metadata

@@ -1,57 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: caishu_model
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - menghuanwd
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-08 00:00:00.000000000 Z
+date: 2014-08-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.5'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.5'
-- !ruby/object:Gem::Dependency
-  name: rake
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: activerecord
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
 description: caishu项目下，dream、wap、weixin、backend所用到的models
 email:
 - 651019063@qq.com
@@ -59,12 +31,30 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
+- ".gitignore"
 - Gemfile
 - LICENSE
 - README.md
 - Rakefile
 - caishu_model.gemspec
+- config/database.yml
+- db/migrate/20131228035304_create_categories.rb
+- db/migrate/20131228035434_create_users.rb
+- db/migrate/20131228040423_create_jokes.rb
+- db/migrate/20131228040436_create_photos.rb
+- db/migrate/20131228040446_create_photo_categories.rb
+- db/migrate/20131228040454_create_moods.rb
+- db/migrate/20131228040501_create_notes.rb
+- db/migrate/20131228040507_create_note_categories.rb
+- db/migrate/20131228040512_create_touches.rb
+- db/migrate/20131228040518_create_philosophies.rb
+- db/migrate/20131228062726_create_goodfriends.rb
+- db/migrate/20131229060517_create_pictures.rb
+- db/migrate/20140105151951_create_photo_details.rb
+- db/migrate/20140215021413_create_englishes.rb
+- db/migrate/20140315034952_create_weixin_messages.rb
+- db/migrate/20140406030204_add_is_display_to_photo.rb
+- db/schema.rb
 - lib/caishu_model.rb
 - lib/caishu_model/category.rb
 - lib/caishu_model/english.rb
@@ -92,17 +82,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: caishu项目的models